]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 00:55:33 +0000 (11:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 00:55:33 +0000 (11:55 +1100)
commitba5880d12847bc5715c5b0af7d7fe16ddd59c261
tree49104420a684fc54836d6ef8a4fc322b8c33b6a6
parent5ceb8ae03afe0a65e8485beff5c60b9748c8bc5a
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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