]> 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, 15 Nov 2011 22:57:47 +0000 (09:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 22:57:47 +0000 (09:57 +1100)
commitb4406b91adc9ae28e550a49d2e4df89b1385aa11
tree09e447f257f431fb9d51b693c3f07d78e8533141
parent5f1490313ec305419f7c854e7ebd9f3d935c3d61
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