summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-03-13 01:59:52 -0400
committerLen Brown <len.brown@intel.com>2008-03-13 01:59:52 -0400
commitb4de123a0bc4a3f0c90899864d51299628729952 (patch)
treee5ca53b6d0f6d52f1a15ef99865b545afa08e3fa /drivers/acpi
parentc523aef0f7284970463ebd77a54bca9069711d4a (diff)
parent3b5fee5952ff7eb6ff7a64247a01040b8b331b74 (diff)
parentd399d130c82a1e1751b7770944f487fbd8b6272a (diff)
parent07d31ee5597dadfd621840e2404b086fa94ef0c6 (diff)
Merge branches 'release', 'ejd', 'sony' and 'wmi' into release