]> 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>
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)
commit24eafbcaed31dfad3fc257f3c25c78b5befc99e8
tree9bf45d9059c76fc3924603745f580307a5c584fe
parenta240289e20f8daae385f465acf5b551defc2b6fe
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

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