]> 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, 8 Nov 2011 23:35:57 +0000 (10:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Nov 2011 23:35:57 +0000 (10:35 +1100)
commit788161d6a3b08fdce00484d36756e806980ce9ce
treef380cd5ef280f0e6da6510c2d5e6fed0741d8f62
parente80f58d6361794d8b6c411522b30326674e6cd78
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/mach-mxs/clock-mx28.c