Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm...
authorGrant Likely <grant.likely@secretlab.ca>
Mon, 1 Aug 2011 14:16:05 +0000 (15:16 +0100)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 1 Aug 2011 14:16:05 +0000 (15:16 +0100)
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile


Trivial merge