Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
commit201531c2777e05c8f859c10fa35542da02e5870b
tree718febbf71832976e1b4495a953fb1ad880151a6
parenta116776f7b6052599df0c67db29c30ea9d69d7ee
parentbeeb5a1e0ef774d0a3e18c5a0e78c39e3e1a5389
parentc1b7bac58fb0d251f86efe7daec1a2851b7792bf
parent925c36bb09bdf3858c10d5a591be737dd133d979
Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next
drivers/thermal/Kconfig
drivers/thermal/Makefile
drivers/thermal/cpu_cooling.c
drivers/thermal/thermal_core.c