]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 03:17:03 +0000 (13:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 03:17:03 +0000 (13:17 +1000)
commit1c54c1fab56a545125b9fc48e92f80e570406f18
treead8dec2af4731aabfac37c68cd463cecd590d8ef
parent82430a6423f2363d355d8f298badb87a7849e4db
parent203b52e38129988b21ebcc21d34262ada966ecc2
Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'

Conflicts:
arch/arm/include/asm/cpuidle.h
arch/arm/mach-at91/cpuidle.c
arch/arm/mach-davinci/cpuidle.c
arch/arm/mach-shmobile/cpuidle.c
drivers/cpuidle/cpuidle.c
include/linux/cpuidle.h