]> 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: 527f799 817c876)
Merge remote-tracking branch 'cpuidle/cpuidle-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:24:51 +0000 (11:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 00:24:51 +0000 (11:24 +1100)
Conflicts:
drivers/base/power/qos.c


Trivial merge
Linux kernel for KaRo TX COM modules