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
..
realmode	x86, trampoline: Use the unified trampoline setup for ACPI wakeup	2011-02-17 21:05:06 -08:00
boot.c	Merge commit 'v2.6.38' into x86/mm	2011-03-15 08:29:44 +01:00
cstate.c	Merge branch 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-21 13:45:38 -07:00
Makefile
sleep.c	x86, trampoline: Use the unified trampoline setup for ACPI wakeup	2011-02-17 21:05:06 -08:00
sleep.h	x86, trampoline: Use the unified trampoline setup for ACPI wakeup	2011-02-17 21:05:06 -08:00
wakeup_32.S	Rename .text.page_aligned to .text..page_aligned.	2010-03-03 11:26:00 +01:00
wakeup_64.S
wakeup_rm.S	x86: Fix binutils-2.21 symbol related build failures	2011-03-09 10:25:45 +01:00