]> 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, 3 Nov 2011 02:05:33 +0000 (13:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:05:33 +0000 (13:05 +1100)
commit4f69aab7cdb41527f48461cea8878b0abf6fc444
tree2d663c1a148a8d64ad5cd6e677a66fa272f01d5a
parent52aefa0d6518a6efc9a931e4c85efa435126a865
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