Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 03:37:50 +0000 (20:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Oct 2010 03:37:50 +0000 (20:37 -0700)
commit10f2a2b0f68abf39c06cf519cbc1740fa50f900b
tree70b33e4437ae0d5ac92f56c60b048756bde7f3e4
parent8814011679d1a47d8b0158fc991727a5859471a0
parentb40827fa7268fda8a62490728a61c2856f33830b
Merge branch 'x86-trampoline-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, mm: Add an initial page table for core bootstrapping
arch/x86/kernel/acpi/sleep.c
arch/x86/kernel/head32.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/trampoline.c
arch/x86/mm/init_32.c