Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
authorLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 13 Mar 2008 05:59:52 +0000 (01:59 -0400)
commitb4de123a0bc4a3f0c90899864d51299628729952
treee5ca53b6d0f6d52f1a15ef99865b545afa08e3fa
parentc523aef0f7284970463ebd77a54bca9069711d4a
parent3b5fee5952ff7eb6ff7a64247a01040b8b331b74
parentd399d130c82a1e1751b7770944f487fbd8b6272a
parent07d31ee5597dadfd621840e2404b086fa94ef0c6
Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
drivers/acpi/scan.c
drivers/misc/acer-wmi.c