]> 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: 257d2ea 3cf7997)
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:31:51 +0000 (11:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:31:51 +0000 (11:31 +1000)
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h


Trivial merge
Linux kernel for KaRo TX COM modules