]> 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: 2e79904 5788f4d)
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 00:39:57 +0000 (10:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 00:39:57 +0000 (10:39 +1000)
Conflicts:
arch/arm/mach-imx/Makefile


Trivial merge
Linux kernel for KaRo TX COM modules