]> 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, 6 Sep 2012 02:20:07 +0000 (12:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:20:07 +0000 (12:20 +1000)
commit9403a121111d59fb6d497522a1a298ef4ae33416
tree86ef4af679449f590e6320943d9538123509bffa
parent25494277db70d4592d6cd5527dd9548c4333040c
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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