summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2013-06-13 05:19:36 +0200
committerZhang Rui <rui.zhang@intel.com>2013-06-13 05:19:36 +0200
commit30072fb91e1447b00fa148500c49010265b530c6 (patch)
tree1dc52bb04d5f8ccf41a4d2b30d1a3f2d535d3179 /drivers/thermal
parentMerge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git int... (diff)
parentthermal: consider emul_temperature while computing trend (diff)
parentthermal: ti-soc-thermal: add DT example for DRA752 chip (diff)
downloadlinux-30072fb91e1447b00fa148500c49010265b530c6.tar.xz
linux-30072fb91e1447b00fa148500c49010265b530c6.zip
Merge branches 'for-rc' and 'ti-soc' of .git into next