]> 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, 28 Jul 2011 01:02:08 +0000 (11:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 01:02:08 +0000 (11:02 +1000)
commit107318d1ffc60fae2518ea7819093fbaff48dd8c
treeb98b5ca9eab6e8d289f998f864e99f4c952b6395
parent98a217a9bc5157433cdd0c06ae3614865cc6d429
parentd8353101eadb262d5a93ef02cc96ae3188520dfb
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/mach-mx27_3ds.c
arch/arm/mach-imx/mm-imx1.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx31.c
arch/arm/mach-imx/mm-imx35.c
arch/arm/mach-mx5/mm.c