Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel...

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

Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)

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

Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
author Zhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
diff --cc drivers/thermal/Kconfig
Simple merge
diff --cc drivers/thermal/samsung/exynos_tmu.c
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
		1	2	3	4
drivers/thermal/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/thermal/samsung/exynos_tmu.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history