Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:32:10 +0000 (09:32 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:32:10 +0000 (09:32 +0800)
commit7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30
tree50cd98e26a1e426e7433c68ea257beb241d7fc62
parent809b6ecb53e35654d988f8f8f263a51ac6d10003
parent98cadf25dae234130994d9c71cd0d925db4b2a6a
parentc422a8ed6fb5ba0c318ae8b31f881e9f2f2f65a1
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
drivers/thermal/Kconfig