diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:57:43 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-21 12:57:43 +0100 |
| commit | 4a84cd3e2433cfb0f208af2f418797b10a451ff3 (patch) | |
| tree | a9c351b5ae6f9d007ca67447ca180b8efe371dfd /drivers/gpu/drm/arm/hdlcd_drv.h | |
| parent | 87f363cf7fd8ab70e5c197dc4f6530c068d4d99c (diff) | |
| parent | f372f4af24443019060fdd05282efb02af0e91db (diff) | |
Merge branch 'latest-armlt-scmi' into latest-armltlatest-armlt-20170721
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
# Conflicts:
# arch/arm64/boot/dts/arm/juno-base.dtsi
# linaro/configs/vexpress64.conf
Diffstat (limited to 'drivers/gpu/drm/arm/hdlcd_drv.h')
0 files changed, 0 insertions, 0 deletions