]> 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, 31 Oct 2012 00:42:35 +0000 (11:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 00:42:35 +0000 (11:42 +1100)
commitc5eb5de13fbb39e668f0a25dfd6e93f4d7541d7c
treea8033213ca7c177452012c194c92d2721058abdf
parent2bff229ac0975e06ce5369f0757df363a9a7f808
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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