]> 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: 39eacb1 dfd86a0)
Merge remote-tracking branch 'ux500-core/ux500-core'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:36:10 +0000 (10:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:36:10 +0000 (10:36 +1000)
Conflicts:
arch/arm/mach-ux500/cache-l2x0.c


Trivial merge
Linux kernel for KaRo TX COM modules