aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-11-06 22:10:14 -0500
committerLen Brown <len.brown@intel.com>2011-11-06 22:10:14 -0500
commite751b759e82629798c4a5e4a87eb3a30c0510154 (patch)
tree225043e83eecdce1ac8d8ccb6d5a115c5d0b6461 /drivers/acpi
parent3bf3f8b19d2bfccc40f13c456bf339fd8f535ebc (diff)
parentf7f71cfbf0c276ee3d8d856d0f35a41aed997fa4 (diff)
parentc1056b42a87b59375f8f81a92ef029165f44fcce (diff)
parent362b646062b2073bd5c38efb42171d86e4f717e6 (diff)
parent18fd470a48396c8795ba7256c5973e92ffa25cb3 (diff)
Merge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup' into acpi