]> 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, 26 Jul 2011 01:26:30 +0000 (11:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 01:26:30 +0000 (11:26 +1000)
commit83f2170c015d9deb70acc7aa2c589ed0dd8a19c7
tree111fce159af011b55120dd5faa118acf6fba725e
parent74159c53b1881eeb66372d8360c46af85c8875fe
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