]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:54:36 +0000 (12:54 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 02:54:36 +0000 (12:54 +1000)
commitc2b4031b35c8cf33604980ad28fd6c48e17ef2e4
tree17dab52c457771b778a3a88b2dadb90433406c5f
parenta2bf6ad63f5efe7ce4d4b2a0acf3981bf4b430b8
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c