]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 01:51:49 +0000 (12:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 01:51:49 +0000 (12:51 +1100)
Conflicts:
arch/arm/mach-mx5/mm.c

1  2 
arch/arm/mach-imx/Kconfig

Simple merge