summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-01-03 15:55:04 +0100
committerZhang Rui <rui.zhang@intel.com>2014-01-03 15:55:04 +0100
commit8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22 (patch)
treec0e3e6435d74ead993a2a9a98bb3dcb04bc0fab1
parentMerge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git int... (diff)
parentThermal: update thermal zone device after setting emul_temp (diff)
parentthermal: imx: add necessary clk operation (diff)
downloadlinux-8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22.tar.xz
linux-8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22.zip
Merge branches 'misc' and 'soc' of .git into next