]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/move' into for-next
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 21:04:14 +0000 (21:04 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Nov 2011 21:04:14 +0000 (21:04 +0000)
commita95e4c9b2b46253b88f073cdc850f1426042c2c8
treedbf613b3a937b241e250e6893d5b77d5bdb85eab
parent58a273745fbb2fbd01d26e7a60f0acc8c1d99469
parent3f07f355704bc2ae26399f17c6d5d46c9a3d78d1
Merge branch 'next/move' into for-next

Conflicts:
arch/arm/plat-mxc/Kconfig
arch/arm/mach-imx/Makefile.boot
arch/arm/mach-imx/clock-mx51-mx53.c
arch/arm/plat-mxc/Kconfig