| commit | a0c32fec7666a0a08adb444aa0177a11b288eda2 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Dec 05 01:23:35 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Dec 05 01:23:33 2013 -0800 |
| tree | 15b9c3452d21aabce413d010000ef43e8a4ca3f5 | |
| parent | e57a61fe811165a8b69fecee84a29cedbe89f395 [diff] | |
| parent | 1cd68b26b1fdcfb583dd01923b9b2e34babbaa2b [diff] |
Merge "msm: gpiomux: remove conflict between nfc and camera on Hisense"