]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Nov 2011 18:48:43 +0000 (18:48 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 28 Nov 2011 18:48:43 +0000 (18:48 +0000)
commitf39abe54f13d6bffe14b7cde720d881b4c68e5df
treeeb41376c51179fff6fd33433fc5cb1b0ba06062f
parent1a269a3f17fd7700032415875f939761bca746d0
parentd28bdfc5c80fb64bf50824920bf9b554732dec74
Merge branch 'next/cleanup' into for-next

Conflicts:
drivers/net/ethernet/cadence/Kconfig
26 files changed:
MAINTAINERS
arch/arm/arm-soc-for-next-contents.txt
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-cam60.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-pcontrol-g20.c
arch/arm/mach-at91/board-qil-a9260.c
arch/arm/mach-at91/board-sam9-l9260.c
arch/arm/mach-at91/board-sam9260ek.c
arch/arm/mach-at91/board-sam9263ek.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/board-stamp9g20.c
arch/arm/mach-at91/board-usb-a926x.c
drivers/net/ethernet/cadence/Kconfig