]> 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>
Wed, 12 Oct 2011 00:45:32 +0000 (11:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 00:45:32 +0000 (11:45 +1100)
commit88947e30af863866398fdd807512ddb16d3a4123
treeb476833fe8fb2cec15758cdd59624457f907f6d0
parentc22491ec9bd542a28bd75504f4a7138d499f1f9b
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

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