| commit | 89f5a3c2ad9cc058de08059ebe444f9e1b6e19a0 | [log] [tgz] |
|---|---|---|
| author | Chris Dearman <chris.dearman@imgtec.com> | Wed Feb 24 14:15:43 2016 -0800 |
| committer | Chris Dearman <chris.dearman@imgtec.com> | Wed Feb 24 14:27:56 2016 -0800 |
| tree | 4fb44eaaf22dade801bec20480b0f2f24dfef35f | |
| parent | fa99f36256df1e21a35c3fcb98ee937cf2231cf3 [diff] | |
| parent | e2fb3608bca9524cc3ec2b2b27994aeb91dd3757 [diff] |
Merge branch imgsystems/4.1-imgsystems into aosp/master
These are the 4.2 USB changes.
Conflicts:
drivers/usb/gadget/function/f_rndis.c
drivers/usb/gadget/function/rndis.c
drivers/usb/gadget/function/rndis.h
Change-Id: I5d494613ee9b75fd674402125351bc7c6d95f9aa