From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 01:09:45 +0000 (-0700)
Subject: Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel... 
X-Git-Tag: v3.0~766
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08839ff8276bd1ba0ce8b2d595f9fe62a5b07210;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Reorder reboot method preferences

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: Fix EDD3.0 data verification.
---

08839ff8276bd1ba0ce8b2d595f9fe62a5b07210