tree 96547759d8877fcca6b9b8a1f68066fe5c65b7fd
parent 27a3b735b70651f28db03e5f92775a40661ba7a6
parent f70e957cda22d309c769805cbb932407a5232219
author Linus Torvalds <torvalds@linux-foundation.org> 1310069893 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310069893 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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