diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-10-03 10:32:56 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-10-03 10:32:56 +0100 |
| commit | 738897a90d6054a74b07246c8760b9c96af461e0 (patch) | |
| tree | df2d10e542829927745d8117e11f5fdcd396885a /MAINTAINERS | |
| parent | 5064fbcb9b30bd0b710e584ec16b7107a869cf44 (diff) | |
| parent | 48373f0ec5b8bed27376322bc3c702a49df4fcd5 (diff) | |
Merge branch 'lsk-3.18-armlt-mali' into lsk-3.18-armltlsk-3.18-armlt-20161001
Conflicts:
arch/arm64/boot/dts/arm/juno-base.dtsi
linaro/configs/vexpress64.conf
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions