diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-29 19:16:04 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-29 19:16:04 +0200 |
| commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa (patch) | |
| tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac /arch/arm/mach-prima2 | |
| parent | Merge branch 'fix-dss-mux' into fixes (diff) | |
| parent | ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition (diff) | |
| download | linux-2533c2cfbff8f0ee53b8448d6362b54c272125aa.tar.xz linux-2533c2cfbff8f0ee53b8448d6362b54c272125aa.zip | |
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
Diffstat (limited to 'arch/arm/mach-prima2')
0 files changed, 0 insertions, 0 deletions