]> 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, 1 Nov 2011 01:15:42 +0000 (12:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Nov 2011 01:15:42 +0000 (12:15 +1100)
commitb3e9f9cdcc29abba929e1e965019b7a1e74988a8
treefffec6052776dc336300ce4ecaf08d0908b5ef1c
parent74e8b1b880babcf86fb3c5f7e237e14c65f69a0f
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