]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'late/kirkwood' into for-next
authorArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2012 13:20:18 +0000 (15:20 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2012 13:20:18 +0000 (15:20 +0200)
commita9dd6129935ee9670ac97c7ecab194e412cfcaef
treebce31f058d8bb35ed7fa9041666e3515dda37ed7
parentd16ae02389140054aace45a0455851c90591193a
parent46f2007c1efadfa4071c17e75f140c47f09293de
Merge branch 'late/kirkwood' into for-next

Conflicts:
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-orion5x/common.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile