Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio/basic_mmio: add missing include of spinlock_types.h gpio/nomadik: fix sleepmode for elder Nomadik
Showing
- arch/arm/mach-ux500/cpu-db8500.c 3 additions, 0 deletionsarch/arm/mach-ux500/cpu-db8500.c
- arch/arm/plat-nomadik/include/plat/gpio.h 1 addition, 0 deletionsarch/arm/plat-nomadik/include/plat/gpio.h
- drivers/gpio/gpio-nomadik.c 29 additions, 11 deletionsdrivers/gpio/gpio-nomadik.c
- include/linux/basic_mmio_gpio.h 1 addition, 0 deletionsinclude/linux/basic_mmio_gpio.h
Loading
Please register or sign in to comment