]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'thermal-soc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:03:41 +0000 (11:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:03:41 +0000 (11:03 +1100)
1  2 
drivers/base/power/opp/core.c
drivers/thermal/Kconfig

Simple merge
Simple merge