summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:51:10 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:51:10 -0400
commitfff251f6b26bb8f4de15fa5906cf2611623b3661 (patch)
tree91841ca77a426eac7393a961fc14a95dc869a15c /drivers/acpi
parent3b4dadf05d177289c279c50030c7c75e004952bb (diff)
parenta5032bfdd9c80e0231a6324661e123818eb46ecd (diff)
parent34ff4dbccccce54c83b1234d39b7ad9e548a75dd (diff)
Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release