]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:06:07 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 02:06:07 +0000 (12:06 +1000)
commit986dc00f1beaa375abaeb17648a253607763a549
tree035dece4c18991c54ef36d9ae52da3cce43a0c3a
parentc507b02a12a20e1a697f6869cfc72e8de0b2ceca
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h