]> 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: a240289 5788f4d)
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:24:51 +0000 (11:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:24:51 +0000 (11:24 +1100)
Conflicts:
arch/arm/mach-mx5/mm.c

1  2 
arch/arm/mach-imx/Kconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-imx/Kconfig
Simple merge
Linux kernel for KaRo TX COM modules