Merge remote-tracking branch 'at91/at91-next'

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_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.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/at91sam9rl_devices.c
Simple merge

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

diff --cc arch/arm/mach-at91/board-afeb-9260v1.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-carmeva.c
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc arch/arm/mach-at91/board-rm9200ek.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-sam9261ek.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-sam9rlek.c
Simple merge

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

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

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

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

diff --cc arch/arm/mach-at91/include/mach/gpio.h
index 2b9a1f51210f0cc048048410bd9e801883e04bc9,5213879ff9033ee63286545d2b4d28749127a8dd..e3fd225121c748f7f592b0ebedfe095028e5845b
--- 1/arch/arm/mach-at91/include/mach/gpio.h
--- 2/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@@ -214,9 -212,14 +212,9 @@@ extern void at91_gpio_resume(void)
   */
  
  #include <asm/errno.h>
 -#include <asm-generic/gpio.h>         /* cansleep wrappers */
 -
 -#define gpio_get_value        __gpio_get_value
 -#define gpio_set_value        __gpio_set_value
 -#define gpio_cansleep __gpio_cansleep
  
- #define gpio_to_irq(gpio) (gpio)
- #define irq_to_gpio(irq)  (irq)
+ #define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)
+ #define irq_to_gpio(irq)  (irq - NR_AIC_IRQS)
  
  #endif        /* __ASSEMBLY__ */
  

diff --cc drivers/ata/pata_at91.c
Simple merge

diff --cc drivers/ide/at91_ide.c
Simple merge