]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78c897e 203b52e)
Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:44:38 +0000 (14:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 04:44:38 +0000 (14:44 +1000)
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


Trivial merge
Linux kernel for KaRo TX COM modules