Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next

author Zhang Rui <rui.zhang@intel.com>

Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)

committer Zhang Rui <rui.zhang@intel.com>

Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
author Zhang Rui <rui.zhang@intel.com>
Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
diff --cc drivers/thermal/Kconfig
Simple merge
diff --cc drivers/thermal/Makefile
Simple merge
diff --cc drivers/thermal/cpu_cooling.c
Simple merge
diff --cc drivers/thermal/thermal_core.c
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Thu, 2 Jan 2014 06:22:28 +0000 (14:22 +0800)
		1	2	3	4
drivers/thermal/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/thermal/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/thermal/cpu_cooling.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/thermal/thermal_core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history