]> 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>
Wed, 30 Nov 2011 00:49:50 +0000 (11:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:49:50 +0000 (11:49 +1100)
commit3b0f46e708b65294da2e4a62ab9eae9e2013b892
tree3914b51761ad2030c80a830e2f496d81d2466eb9
parent747b693fdacc8245646152845bfedad26627448f
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