Len Brown 02e2407858 Merge branch 'linus' into release ...

Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>

2011-03-23 02:34:54 -04: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

Merge branch 'linus' into release

2011-03-23 02:34:54 -04:00

sleep.h

Merge branch 'linus' into release

2011-03-23 02:34:54 -04: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