tree d7f254a1d75807cc8b50f416ba3bd13010913ddc
parent fc82e1d59a24cbac01c49d4eb3b28d6abc26a5f4
parent 2ae9d293b14d17f35eff624272cfecac7979a2ee
author Linus Torvalds <torvalds@linux-foundation.org> 1300295402 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300295402 -0700

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