]> 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: 98ea620 5788f4d)
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 01:48:02 +0000 (12:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 01:48:02 +0000 (12:48 +1100)
Conflicts:
arch/arm/mach-imx/Makefile


Trivial merge
Linux kernel for KaRo TX COM modules