tree 6835f907a07b5d5d4861455e8b46398da652a3d4
parent f6143a9b732977859cb6e04c604d04976aa5ccbd
parent 05e407603e527f9d808dd3866d3a17c2ce4dfcc5
author Linus Torvalds <torvalds@linux-foundation.org> 1282339508 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282339508 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, apic: Fix apic=debug boot crash
  x86, hotplug: Serialize CPU hotplug to avoid bringup concurrency issues
  x86-32: Fix dummy trampoline-related inline stubs
  x86-32: Separate 1:1 pagetables from swapper_pg_dir
  x86, cpu: Fix regression in AMD errata checking code