]> 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: 5828961 cd0a30d)
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:40:14 +0000 (10:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:40:14 +0000 (10:40 +1000)
Conflicts:
arch/arm/mach-imx/clk-imx6q.c


Trivial merge
Linux kernel for KaRo TX COM modules