]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/dt' into for-linus
authorArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 16:14:14 +0000 (17:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 16:14:14 +0000 (17:14 +0100)
commiteed7041a509503610fd0ccb5042a14de5759bd6b
tree4f0091dc675059415e760bfdb472c5a2cee5bb1a
parent38b9c2164fc27127d4a3347c4774c70085b2a77e
parentc72dbae971400e466ad9ff16c920cd6d9d8c55a1
Merge branch 'next/dt' into for-linus

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-omap2/board-generic.c
arch/arm/common/gic.c
arch/arm/mach-at91/Kconfig
arch/arm/mach-at91/Makefile
arch/arm/mach-at91/Makefile.boot
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
drivers/of/irq.c
drivers/tty/serial/msm_serial.c