| commit | c92237a95692aaec5e86446a9d0f3e261e18f7cb | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@quicinc.com> | Fri May 05 11:16:44 2017 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Fri May 05 11:16:44 2017 -0700 |
| tree | c606ae58f274015f1fdbf7fe594c6009d0a42e5b | |
| parent | 356027c1e72b135c09e12423cc5f4fac88825489 [diff] | |
| parent | c8ef2ca2009341b328bd936690e451d5e739f075 [diff] |
Merge "dwc3: gadget: Fix improper merge conflict resolution" into msm-4.9