summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-11-07 08:45:54 +0800
committerZhang Rui <rui.zhang@intel.com>2013-11-07 08:45:54 +0800
commit86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197 (patch)
tree925e9a61b32fb90f10cecb3e2726282b5c7bcc33 /drivers/acpi
parent90fc9cd286846f884e35fb6a611d0c50f2d21a26 (diff)
parent94f69966faf8e70bd655ea25f9dd5b9400567b75 (diff)
parenta9f2d19ba7be38590c84487359891d45a66b62f4 (diff)
Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next