Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: 
Arnd Bergmann <arnd@arndb.de>
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/common/scoop.c 1 addition, 1 deletionarch/arm/common/scoop.c
- arch/arm/include/asm/gpio.h 19 additions, 0 deletionsarch/arm/include/asm/gpio.h
- arch/arm/include/asm/hardware/iop3xx-gpio.h 2 additions, 0 deletionsarch/arm/include/asm/hardware/iop3xx-gpio.h
- arch/arm/mach-at91/at91cap9_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91cap9_devices.c
- arch/arm/mach-at91/at91rm9200_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91rm9200_devices.c
- arch/arm/mach-at91/at91sam9260_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9260_devices.c
- arch/arm/mach-at91/at91sam9261_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9261_devices.c
- arch/arm/mach-at91/at91sam9263_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9263_devices.c
- arch/arm/mach-at91/at91sam9g45_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9g45_devices.c
- arch/arm/mach-at91/at91sam9rl_devices.c 1 addition, 1 deletionarch/arm/mach-at91/at91sam9rl_devices.c
- arch/arm/mach-at91/board-1arm.c 1 addition, 1 deletionarch/arm/mach-at91/board-1arm.c
- arch/arm/mach-at91/board-afeb-9260v1.c 1 addition, 1 deletionarch/arm/mach-at91/board-afeb-9260v1.c
- arch/arm/mach-at91/board-cam60.c 1 addition, 1 deletionarch/arm/mach-at91/board-cam60.c
- arch/arm/mach-at91/board-cap9adk.c 1 addition, 1 deletionarch/arm/mach-at91/board-cap9adk.c
- arch/arm/mach-at91/board-carmeva.c 1 addition, 1 deletionarch/arm/mach-at91/board-carmeva.c
- arch/arm/mach-at91/board-cpu9krea.c 1 addition, 1 deletionarch/arm/mach-at91/board-cpu9krea.c
- arch/arm/mach-at91/board-cpuat91.c 1 addition, 1 deletionarch/arm/mach-at91/board-cpuat91.c
- arch/arm/mach-at91/board-csb337.c 1 addition, 1 deletionarch/arm/mach-at91/board-csb337.c
- arch/arm/mach-at91/board-csb637.c 1 addition, 1 deletionarch/arm/mach-at91/board-csb637.c
Loading
Please register or sign in to comment