tree 15b9c3452d21aabce413d010000ef43e8a4ca3f5
parent e57a61fe811165a8b69fecee84a29cedbe89f395
parent 1cd68b26b1fdcfb583dd01923b9b2e34babbaa2b
author Linux Build Service Account <lnxbuild@localhost> 1386235415 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1386235413 -0800

Merge "msm: gpiomux: remove conflict between nfc and camera on Hisense"