Merge branches 'misc' and 'soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 3 Jan 2014 14:55:04 +0000 (22:55 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 3 Jan 2014 14:55:04 +0000 (22:55 +0800)
commit8c59ecb5c1dca77ea83634b6a6d8e7c58bb31b22
treec0e3e6435d74ead993a2a9a98bb3dcb04bc0fab1
parent201531c2777e05c8f859c10fa35542da02e5870b
parent800744bf31df54b0cd4d1104ccfa426d3f578f0e
parent329fe7b14d6cef4b8cf8c866ff41057a70224de2
Merge branches 'misc' and 'soc' of .git into next
drivers/thermal/thermal_core.c