Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Mar 2011 17:10:02 +0000 (10:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Mar 2011 17:10:02 +0000 (10:10 -0700)
commite7fd3b4669f5b835c8afce28425d9f698a558115
treed7f254a1d75807cc8b50f416ba3bd13010913ddc
parentfc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4
parent2ae9d293b14d17f35eff624272cfecac7979a2ee
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: Fix binutils-2.21 symbol related build failures
  x86-64, trampoline: Remove unused variable
  x86, reboot: Fix the use of passed arguments in 32-bit BIOS reboot
  x86, reboot: Move the real-mode reboot code to an assembly file
  x86: Make the GDT_ENTRY() macro in <asm/segment.h> safe for assembly
  x86, trampoline: Use the unified trampoline setup for ACPI wakeup
  x86, trampoline: Common infrastructure for low memory trampolines

Fix up trivial conflicts in arch/x86/kernel/Makefile
arch/x86/Kconfig
arch/x86/include/asm/acpi.h
arch/x86/kernel/Makefile
arch/x86/kernel/apm_32.c
arch/x86/kernel/entry_32.S
arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmlinux.lds.S
drivers/acpi/sleep.c