]> 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: cab551a 42ead3a)
Merge remote-tracking branch 'xilinx/arm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:52:01 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 23:52:01 +0000 (10:52 +1100)
Conflicts:
arch/arm/mach-zynq/common.c


Trivial merge
Linux kernel for KaRo TX COM modules