]> 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, 4 Dec 2011 23:56:32 +0000 (10:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 4 Dec 2011 23:56:32 +0000 (10:56 +1100)
commit11bfaa377ecd77603c36f2c07e5446bbeff60029
treed075a82c13207bddf73fb8fd50088f6bc966e551
parentb708d2cef960ad3f101f31a38909d08ab9806d51
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