| commit | c8ef2ca2009341b328bd936690e451d5e739f075 | [log] [tgz] |
|---|---|---|
| author | Mayank Rana <mrana@codeaurora.org> | Wed May 03 12:53:06 2017 -0700 |
| committer | Mayank Rana <mrana@codeaurora.org> | Wed May 03 12:55:56 2017 -0700 |
| tree | f0cf521d9be05f96e8289199cd2621a408da17da | |
| parent | c6d522c5846aa3a05d0077b7bbdf833a2f5cfc17 [diff] |
dwc3: gadget: Fix improper merge conflict resolution
Commit 71ce1d940803 ("Merge remote-tracking branch 'tmp-44e63be' into
4.9") tried to get upstream commit de288e36fe33 ("usb: dwc3: gadget:
delay unmap of bounced requests") which resulted into merge conflict.
previous merge conflict is not proper, hence fix the same.
Change-Id: I1178b59bcee11977cdf7ac6e5d5d166f27a323e0
Signed-off-by: Mayank Rana <mrana@codeaurora.org>