]> 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>
Mon, 24 Oct 2011 21:24:39 +0000 (08:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 24 Oct 2011 21:24:39 +0000 (08:24 +1100)
commitf39c802ed77b7386b4a8bc9686194e4d20cfbaeb
tree3751aded32643ec0f3d9b697f1df7e67e873d8cd
parent8b1a45a64343390e37df11a64b8e36547be03832
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-imx/Kconfig
arch/arm/mach-mxs/clock-mx28.c