]> 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>
Thu, 1 Dec 2011 23:46:47 +0000 (10:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Dec 2011 23:46:47 +0000 (10:46 +1100)
commitd2719edcf3d01cb4185c881b01ef7b2b5543e71b
tree96e509e9a891a2ba18878ce51f36878c2ae42645
parentf921dace0e7d16854245f8a1b13ce41d934a1dfa
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