diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-01-03 15:55:04 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-01-03 15:55:04 +0100 |
commit | 8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22 (patch) | |
tree | c0e3e6435d74ead993a2a9a98bb3dcb04bc0fab1 | |
parent | Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git int... (diff) | |
parent | Thermal: update thermal zone device after setting emul_temp (diff) | |
parent | thermal: imx: add necessary clk operation (diff) | |
download | linux-8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22.tar.xz linux-8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22.zip |
Merge branches 'misc' and 'soc' of .git into next