Len Brown a733a5da97 Merge branches 'release' and 'fluff' into release ... Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>		2008-02-07 03:38:22 -05:00
..
boot.c	Merge branches 'release' and 'fluff' into release	2008-02-07 03:38:22 -05:00
cstate.c	x86: convert cpuinfo_x86 array to a per_cpu array	2007-10-19 20:35:04 +02:00
Makefile	x86: unify arch/x86/kernel/acpi/sleep*.c	2008-01-30 13:32:54 +01:00
processor.c	ACPI: Set _PSD ACPI_PDC_SMP_T_SWCOORD	2008-02-02 02:22:43 -05:00
sleep.c	x86: unify arch/x86/kernel/acpi/sleep*.c	2008-01-30 13:32:54 +01:00
sleep_32.c	x86: unify arch/x86/kernel/acpi/sleep*.c	2008-01-30 13:32:54 +01:00
wakeup_32.S	x86: make arch/x86/kernel/acpi/wakeup_32.S use a separate	2008-01-30 13:32:50 +01:00
wakeup_64.S	x86: rename the struct pt_regs members for 32/64-bit consistency	2008-01-30 13:30:56 +01:00