]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:58:56 +0000 (11:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 00:58:56 +0000 (11:58 +1100)
commit76e06581ba23c75c18fdaff61f116c57f9c9b2f7
tree2db1d1df5b72733204b4ceefc603e3f3f6583d9d
parentac578fb9f3ce8c949576d1d8d5c3f61deb15c320
parentc698a4492f01127ca90fc28cd5157f3d616fe4ff
Merge remote-tracking branch 'thermal/next'

Conflicts:
drivers/cpufreq/Kconfig
MAINTAINERS
drivers/cpufreq/Kconfig
drivers/cpufreq/cpufreq-cpu0.c