From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 30 May 2012 19:11:26 +0000 (-0700)
Subject: Merge branch 'x86/trampoline' into x86/urgent
X-Git-Tag: v3.5~284^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbd771474ec44b516107685d77e1c80bbe09f141;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'x86/trampoline' into x86/urgent

x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

bbd771474ec44b516107685d77e1c80bbe09f141