]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1a60ed 5788f4d)
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 02:18:54 +0000 (12:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 02:18:54 +0000 (12:18 +1000)
Conflicts:
arch/arm/mach-imx/Makefile


Trivial merge
Linux kernel for KaRo TX COM modules