summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-02-19 01:51:15 -0500
committerLen Brown <len.brown@intel.com>2010-02-19 01:51:15 -0500
commitdd26809ec74ba824b5528a15b4fcbdb031810e0c (patch)
treef70cc3af2422e5023a07a38c6b1aecd6245db0ad /drivers/power
parent7a4c7257c44233c01d08f8d3142bdfe0fccf911e (diff)
parent1a820cb88088063c04aac1c47f04eaa608e5822d (diff)
parent439913fffd39374c3737186b22d2d56c3a0ae526 (diff)
parent0be57be6c50fd0157058bb2e9d51b0848de2fb61 (diff)
parent6204ff7f967d68b6c3b830b6df2cf2a3081b77a8 (diff)
parentc67fcd670b55e89e0c129fbf7fae854bd1f8bfa6 (diff)
parenteddbdfb3676ed14609b68423875469f3d74bb974 (diff)
parent0c99c5288eb9b1bbc9684b0ec0fd7efc578749b3 (diff)
parentccb2967667a49ad3f0846a88bb1fe040f4e31095 (diff)
parent38bcb37a6f63fcdfcc0dd0af3ec5c03a4b7be48e (diff)
parent455c0d71d46e86b0b7ff2c9dcfc19bc162302ee9 (diff)
parentcffdde993a016bedbc2f5eb60d00c3a766ffb612 (diff)
parent8b7ef6d8f16274da42344cd50746ddb1c93c25ea (diff)
Merge branches 'acpi-reset-expect-refresh', 'acpica', 'apei-v3-2.6.34', 'asus', 'battery-2.6.34', 'bqc-needs-rui-ack', 'bugzilla-531916-power-state-for-2.6.34', 'ht-cleanup', 'misc-2.6.34', 'pcc', 'sony-2.6.34-expect-ack', 'suse-bugzilla-531547' and 'tz-check' into test