tree cae3f24edb3c309d0157f278d3bbe0d720f43997
parent 5b8ce5eb81220b6329c467f76d1bfc9959dbfffc
parent 1a5ab4b3e6087726dfc00207b36c91d3061468e8
author Grant Likely <grant.likely@secretlab.ca> 1312208165 +0100
committer Grant Likely <grant.likely@secretlab.ca> 1312208165 +0100

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

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