]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 23:47:59 +0000 (10:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 23:47:59 +0000 (10:47 +1100)
commitb7605c54bb08331a93ac33c24d0d91114c701f2e
tree9b387f5adc7ae40be3cf9d84379ca4d9e5d40d7e
parenta7bdfcbb5000bcdcaa4fe21579a15bed06923ec4
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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