]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:21:42 +0000 (10:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 14 Oct 2012 23:21:42 +0000 (10:21 +1100)
commitabd156e42795b249407b83e45ae560bea54ec4d7
tree2d9fe7fe6d0e57a0c8e4060ec9cf2ed4c3b8beae
parent8352b75df6401026df2b3274af6e16b01daf1ddb
parent3cf7997a389de59498c966c529456696ce8bc1a7
Merge remote-tracking branch 'cpuidle/cpuidle-next'

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