Merge branch 'kirkwood/dt' into next/dt2
authorArnd Bergmann <arnd@arndb.de>
Sat, 24 Mar 2012 19:15:55 +0000 (19:15 +0000)
committerArnd Bergmann <arnd@arndb.de>
Sat, 24 Mar 2012 19:16:04 +0000 (19:16 +0000)
commit7d1206bc2859c6e9f46e35ae697c138e7d7858a7
tree14af84e9a635e59293edf81aa562b6740c57d310
parentf4eb28340771c12cdbf8b5ec149dbd3b0eef1687
parentc899445f9783309ac73073282d4c0ae27f51fa9a
Merge branch 'kirkwood/dt' into next/dt2

This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/boot/dts/tegra-paz00.dts
arch/arm/mach-imx/Kconfig
arch/arm/mach-mmp/pxa168.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile