]> 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>
Wed, 4 Apr 2012 03:06:34 +0000 (13:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 03:06:34 +0000 (13:06 +1000)
commitc690c12b0bf66ecfcab9b3a01177c18cbaa40fdd
treed06057f6073c181be6c28135d6234591113f10f2
parent5fee4c2be49d915256bb0c0e51ef5209d92f0fd0
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