]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:22:22 +0000 (11:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:22:22 +0000 (11:22 +1100)
commit4033aad3567e51dec1590b401872dfc8f478a281
tree2642ea14553e8d575b08a58a760614a01acd6323
parent4b76a83012a816374bec3cadd2524288e6ee41f9
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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