summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2015-09-02 10:08:02 +0800
committerZhang Rui <rui.zhang@intel.com>2015-09-02 10:08:02 +0800
commit5a924a07f882e866f2337bf65048be357956691a (patch)
tree9044da89d0057e67ddd968fbf57f848e6b591bc9 /drivers/acpi
parent64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff)
parent934c93b8c193b62fc86256ea64aef65e9a7b4e9e (diff)
parentd0a12625d2ff2c63321b3cf48c48184748ab577a (diff)
Merge branches 'thermal-core' and 'thermal-intel' of .git into next