From: Grant Likely <grant.likely@secretlab.ca>
Date: Wed, 15 Jun 2011 20:57:39 +0000 (-0600)
Subject: Merge branch 'gpio/next-tegra' into gpio/next
X-Git-Tag: v3.1-rc1~313^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc7c85210d75b7a8a7326284b4f608a16f52ffc;p=pandora-kernel.git

Merge branch 'gpio/next-tegra' into gpio/next

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
---

2bc7c85210d75b7a8a7326284b4f608a16f52ffc
Reading git-diff-tree failed