]> 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>
Sun, 20 Nov 2011 23:12:07 +0000 (10:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:12:07 +0000 (10:12 +1100)
commitbba44ed12fa7fdff9850ff144edb4cee1234ffa9
treee34ca624dde85bd7f3d27f71c2b2c0cb49bb4d3d
parent8f3dde19c7e2e627131d6cd725814140e79501e7
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