Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:39:10 +0000 (08:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:39:10 +0000 (08:39 +0200)
commitca90666287401b475d9e0becf85bd02f069f1de8
treead4dd789f8d5ab639c78997d3655b94fcbf660ef
parent60325f0c6ee7c6b68f95aaa643260fb33d4bdd88
parent374e759db148d1e874e3afb76707082af67e0984
Merge branch 'gpio' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
  ARM: 7135/1: ep93xx: bring back missing <mach/gpio.h>
  ARM: 7104/1: plat-pxa: break out GPIO driver specifics
  ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
  ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
  ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
  ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
  ARM: 7083/1: rewrite U300 GPIO to use gpiolib
  ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
  ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
  ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
  ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
  ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
  ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
  ARM: 7057/1: mach-pnx4008: rename GPIO header
  ARM: 7056/1: plat-nomadik: kill off <plat/gpio.h>
  ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
  ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
  ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
  ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
  ARM: 7043/1: mach-ixp2000: rename GPIO header
  ...

Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually
17 files changed:
arch/arm/Kconfig
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-mmp/gplugd.c
arch/arm/mach-mmp/pxa168.c
arch/arm/mach-msm/board-msm7x30.c
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-pxa/irq.c
arch/arm/mach-sa1100/Makefile
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/core.c
arch/arm/mach-u300/mmc.c
drivers/ata/pata_at91.c
drivers/gpio/gpio-omap.c
drivers/net/ethernet/cadence/at91_ether.c
drivers/tty/serial/atmel_serial.c
drivers/usb/host/ohci-pnx4008.c