summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-14 02:44:28 -0500
committerLen Brown <len.brown@intel.com>2008-02-14 02:44:28 -0500
commitf60d63f642d824914677fb40330671117dc39c3b (patch)
tree676aea14462e2c99eecef470b000dedff676e49b /drivers/acpi
parent46c1fbdb7191bf07979d7cd5f08d1a86458181a2 (diff)
parentfe8e288a63f2f3c51c288500282d0eb5cd26a534 (diff)
parent6bf69b5ebf22f8f5b4551bad688979fe29049126 (diff)
Merge branches 'release', 'dmi', 'idle' and 'misc' into release