From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 1 Aug 2011 14:16:05 +0000 (+0100)
Subject: Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm... 
X-Git-Tag: v3.1-rc1~97^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=867f503d580eafbcc342141bae53cf6a27d413b1;p=pandora-kernel.git

Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next

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

867f503d580eafbcc342141bae53cf6a27d413b1
Reading git-diff-tree failed