From: Tony Lindgren <tony@atomide.com>
Date: Thu, 29 Mar 2012 17:16:04 +0000 (-0700)
Subject: Merge branch 'fixes-gpio-to-irq' into fixes
X-Git-Tag: v3.4-rc1~30^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2533c2cfbff8f0ee53b8448d6362b54c272125aa;p=pandora-kernel.git

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
---

2533c2cfbff8f0ee53b8448d6362b54c272125aa
Reading git-diff-tree failed