diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-06-13 05:19:36 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-06-13 05:19:36 +0200 |
commit | 30072fb91e1447b00fa148500c49010265b530c6 (patch) | |
tree | 1dc52bb04d5f8ccf41a4d2b30d1a3f2d535d3179 /drivers/thermal | |
parent | Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git int... (diff) | |
parent | thermal: consider emul_temperature while computing trend (diff) | |
parent | thermal: ti-soc-thermal: add DT example for DRA752 chip (diff) | |
download | linux-30072fb91e1447b00fa148500c49010265b530c6.tar.xz linux-30072fb91e1447b00fa148500c49010265b530c6.zip |
Merge branches 'for-rc' and 'ti-soc' of .git into next