Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:09:45 +0000 (18:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:09:45 +0000 (18:09 -0700)
commitec75579dea2ca18efda36ac0ce3eea8fd5dbb632
tree468a056d2039eb368f3e73c8bfd8124c81dff8bb
parent585bda46522f84d67d343e011ba97fa4589315c3
parentdfd6b7fa997f1e5a524451dab944f164fe99cda1
parent9e99b2a81dfc8e15e5813476c778c6ebdeebacf5
Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/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.