Merge branches 'release' and 'wmi-2.6.25' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:19:43 +0000 (03:19 -0500)
commit060195500e0347a6ba8ea89739a9898961eb6f2b
tree5afba4e8daae642d33b7a4daa97d63c54776b786
parent26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7
parentdd8cd7793781c87be47bbfee65efa3fb5110f898
Merge branches 'release' and 'wmi-2.6.25' into release
MAINTAINERS
drivers/acpi/Kconfig
drivers/misc/Kconfig
drivers/misc/Makefile
include/linux/acpi.h