Merge branches 'exynos', 'imx' and 'fixes' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 07:25:27 +0000 (15:25 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 Aug 2013 07:25:27 +0000 (15:25 +0800)
commit036e8a13b8b047aeb553dd87acf2aca8edc7dfa8
tree8e5e84e2d1230677bb95dfebdf3daad98febef42
parentaa1ab4347ec40da87085abaa0db18268da2d0042
parent37713a1e8e4c1a1067ad4c99296f78d3c82ed9c4
parent044d5c26da262fa433dacbe1c6962459050d6b06
Merge branches 'exynos', 'imx' and 'fixes' of .git into next
drivers/thermal/Kconfig
drivers/thermal/Makefile