From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Jul 2011 20:18:13 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc7~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e55f1b1c00a2df492fbdaeb3fcba67a45bc82a0e;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Don't use the EFI reboot method by default
  x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
  x86, reboot: Acer Aspire One A110 reboot quirk
  x86-32, NUMA: Fix boot regression caused by NUMA init unification on highmem machines
---

e55f1b1c00a2df492fbdaeb3fcba67a45bc82a0e