]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'fixes-gpio-to-irq' into fixes
authorTony Lindgren <tony@atomide.com>
Thu, 29 Mar 2012 17:16:04 +0000 (10:16 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 29 Mar 2012 17:16:04 +0000 (10:16 -0700)
commit2533c2cfbff8f0ee53b8448d6362b54c272125aa
treee254f804f2da2f79e66ea71a1e534574ae9da2ac
parenta2cb960f171228e17a28ff734289be60b75417c7
parent21235bdb8aa5e8320b08f79525a45185a52b07df
Merge branch 'fixes-gpio-to-irq' into fixes

Conflicts:
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c
19 files changed:
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-htcherald.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-omap2/common-board-devices.c
arch/arm/plat-omap/include/plat/gpio.h
drivers/input/serio/ams_delta_serio.c