| commit | 867f503d580eafbcc342141bae53cf6a27d413b1 | [log] [tgz] |
|---|---|---|
| author | Grant Likely <grant.likely@secretlab.ca> | Mon Aug 01 15:16:05 2011 +0100 |
| committer | Grant Likely <grant.likely@secretlab.ca> | Mon Aug 01 15:16:05 2011 +0100 |
| tree | cae3f24edb3c309d0157f278d3bbe0d720f43997 | |
| parent | 5b8ce5eb81220b6329c467f76d1bfc9959dbfffc [diff] | |
| parent | 1a5ab4b3e6087726dfc00207b36c91d3061468e8 [diff] |
Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next Conflicts: drivers/gpio/Kconfig drivers/gpio/Makefile