]> 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>
Fri, 18 Nov 2011 00:10:21 +0000 (11:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:10:21 +0000 (11:10 +1100)
commitc17321993d9968a08a656ab50e7380a24561ca27
treec39e323f59e2e419f0efe60374ccaa8bf11a4a11
parent9a3265f514018b5f87860db6bd04746cfd59b626
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