Merge branches 'release' and 'wmi-2.6.25' into release
Len Brown [Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)]
1  2 
MAINTAINERS
drivers/acpi/Kconfig
drivers/misc/Kconfig
drivers/misc/Makefile
include/linux/acpi.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge