]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'i.MX/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:41:12 +0000 (10:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:41:12 +0000 (10:41 +1100)
commit40ffca41bc7d51986310f112fab59fcab65a498f
tree3a72d2fa7d335269fceb775ff62c376c39d71e8e
parentc35dab9d04b691ea0a03d7cecfd3ac2abad03c54
parent5788f4d617769d5f5b8ffa88d6015f4390229855
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/mach-imx/devices-imx53.h
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Makefile
arch/arm/mach-mx5/pm-imx5.c
arch/arm/plat-mxc/include/mach/hardware.h
arch/arm/mach-mxs/clock-mx28.c