summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-11-06 22:14:50 -0500
committerLen Brown <len.brown@intel.com>2011-11-06 22:14:50 -0500
commitefb90582c575084723cc14302c1300cb26c7e01f (patch)
tree25af70a2c40e7e404215acd9aadfa42e71e716ae /include/acpi
parente751b759e82629798c4a5e4a87eb3a30c0510154 (diff)
parent46bcfad7a819bd17ac4e831b04405152d59784ab (diff)
parent22f4521d664030e417f41953e922f61c65f2e189 (diff)
parentaeae1e92daec5a38b40ad12598b97501b675a381 (diff)
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next