Linus Torvalds e7fd3b4669 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
2011-03-16 10:10:02 -07:00
..
2011-03-15 00:43:16 +01:00
2010-10-15 15:53:27 +02:00
2011-01-12 04:27:00 -05:00
2010-10-15 15:53:27 +02:00
2011-01-12 05:03:13 -05:00
2011-01-20 18:30:17 -08:00
2011-02-21 09:43:56 +01:00
2010-09-28 21:38:19 -04:00
2011-01-12 05:06:01 -05:00
2011-01-12 04:27:00 -05:00