Merge branch 'drivers/macb-gem-cleanup' into at91/gpio

diff --cc arch/arm/mach-at91/at91cap9.c
Simple merge

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/board-cam60.c
Simple merge

diff --cc arch/arm/mach-at91/board-cap9adk.c
Simple merge

diff --cc arch/arm/mach-at91/board-cpu9krea.c
Simple merge

diff --cc arch/arm/mach-at91/board-neocore926.c
Simple merge

diff --cc arch/arm/mach-at91/board-pcontrol-g20.c
Simple merge

diff --cc arch/arm/mach-at91/board-qil-a9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9260ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9263ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-snapper9260.c
Simple merge

diff --cc arch/arm/mach-at91/board-stamp9g20.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a926x.c
Simple merge