Skip to content
Commit 867f503d authored by Grant Likely's avatar Grant Likely
Browse files

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

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
parents 5b8ce5eb 1a5ab4b3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment