| commit | fa99f36256df1e21a35c3fcb98ee937cf2231cf3 | [log] [tgz] |
|---|---|---|
| author | Chris Dearman <chris.dearman@imgtec.com> | Tue Feb 16 10:45:45 2016 -0800 |
| committer | Chris Dearman <chris.dearman@imgtec.com> | Wed Feb 24 14:14:36 2016 -0800 |
| tree | e397323a4644cbb7d03349fdb7c3bd6da57d9e9a | |
| parent | 70c68b8d90c19f04ff2ecc751428426e87f25bc8 [diff] |
Merge branch imgsystems/4.1-imgsystems into aosp/master This is a partial merge of the imgsystems/4.1-imgsystems branch before the 4.2 USB updates are imported; the 4.2 USB changes will cause some additional conflicts with the Android USB changes. Conflicts: arch/mips/boot/dts/pistachio/Makefile arch/mips/boot/dts/pistachio/pistachio_marduk.dts Change-Id: I560904bc1cbbc28cf33337ebd21555138d42a557