]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'thermal/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:03:12 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:03:12 +0000 (12:03 +1100)
commit072d8366f9d8254e8d340abc0175cd775b1bf290
tree3565cbd53ac97efc016eb1e22496a27f58e15c3e
parent65e0e8730837c596dd41af0f8d1fe0a8d6bc5c20
parentc698a4492f01127ca90fc28cd5157f3d616fe4ff
Merge remote-tracking branch 'thermal/next'

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