Merge branches 'release' and 'wmi-2.6.25' into release

author Len Brown <len.brown@intel.com>

Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)

committer Len Brown <len.brown@intel.com>

Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
author Len Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
committer Len Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/Makefile
Simple merge
diff --cc include/linux/acpi.h
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
committer	Len Brown <len.brown@intel.com>
	Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/acpi.h	patch \|	diff1 \|	diff2 \|	blob \| history