Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel...
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
commit63745aa72ed16154b82a0c9ed22a88001d6ea0fa
tree153d8f5f80bdcd574632e846138a8751e1ee7b78
parente6e0a68c6cd585773fa1fbbd1ca71272afe15203
parent9550b8d1dcfeceb4f6def1f0c56db4daee6bb4d7
parentbc40b5e320dfe4a691a6cf09ac5c8005d561eebd
parentfa018d3eed0960a5dcc2d93bb59a770ea341bc9e
Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next
drivers/thermal/Kconfig
drivers/thermal/samsung/exynos_tmu.c