From: H. Peter Anvin Date: Wed, 30 May 2012 19:11:26 +0000 (-0700) Subject: Merge branch 'x86/trampoline' into x86/urgent X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bbd771474ec44b516107685d77e1c80bbe09f141;p=openwrt%2Fstaging%2Fblogic.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 --- bbd771474ec44b516107685d77e1c80bbe09f141