Merge branch 'linus' into release
Len Brown [Sun, 15 Aug 2010 05:06:31 +0000 (01:06 -0400)]
Conflicts:
drivers/acpi/debug.c

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

1  2 
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/acpi/internal.h
drivers/acpi/osl.c
drivers/acpi/processor_idle.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge