Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 05:06:31 +0000 (01:06 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 05:06:31 +0000 (01:06 -0400)
commit95ee46aa8698f2000647dfb362400fadbb5807cf
treee5a05c7297f997e191c73091934e42e3195c0e40
parentcfa806f059801dbe7e435745eb2e187c8bfe1e7f
parent92fa5bd9a946b6e7aab6764e7312e4e3d9bed295
Merge branch 'linus' into release

Conflicts:
drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Kconfig
drivers/acpi/Makefile
drivers/acpi/internal.h
drivers/acpi/osl.c
drivers/acpi/processor_idle.c