Merge branch 'int340x-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
commit6ceaf58abe25e86292152005c51169796bad3407
treee97a032bc9dc63da9939136bd32ed5e0ad0f09bc
parent9ceaa81efd1dd5ec83cf6be5a9445809583a03b6
parentd8054749c6795073cb427465a726213d45898f68
Merge branch 'int340x-thermal' of .git into next
drivers/thermal/Kconfig
drivers/thermal/Makefile