]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commitf66eacfdb43a9aa0671a10be3e17e593af4ca59a
treef907266aa6bdf9b7d1d1482af27248c745dfc893
parent0b2d104dc598b375fbf37e39d63a0fec1e41ddab
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/mm.c
arch/arm/mach-imx/Kconfig