| commit | 2533c2cfbff8f0ee53b8448d6362b54c272125aa | [log] [tgz] |
|---|---|---|
| author | Tony Lindgren <tony@atomide.com> | Thu Mar 29 10:16:04 2012 -0700 |
| committer | Tony Lindgren <tony@atomide.com> | Thu Mar 29 10:16:04 2012 -0700 |
| tree | e254f804f2da2f79e66ea71a1e534574ae9da2ac | |
| parent | a2cb960f171228e17a28ff734289be60b75417c7 [diff] | |
| parent | 21235bdb8aa5e8320b08f79525a45185a52b07df [diff] |
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