| commit | e2fb3608bca9524cc3ec2b2b27994aeb91dd3757 | [log] [tgz] |
|---|---|---|
| author | Chris Dearman <chris.dearman@imgtec.com> | Tue Feb 16 12:58:31 2016 -0800 |
| committer | Chris Dearman <chris.dearman@imgtec.com> | Tue Feb 16 13:09:17 2016 -0800 |
| tree | d8c44e5481668cb408db3caac037fcd4823219ca | |
| parent | 217d0c79fea0526b2400301eaf20147d21dfde9c [diff] |
Merge imgsystems/4.1-imgsystems into aosp/master This merge includes 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