]> 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>
Tue, 17 Apr 2012 03:45:29 +0000 (13:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:45:29 +0000 (13:45 +1000)
commit50d1713ea8a7c26bf7aade567db506e7364d9d4c
tree5a319915e32e29ed2227ac33157251721a922c8d
parent2846c63c6682fe9feca36ec08b68499381ef4513
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