summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_guc_fw.h
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-03-18 17:48:59 +0100
committerLinus Walleij <linus.walleij@linaro.org>2018-03-18 17:48:59 +0100
commit95260c17b27e4bdacf85022e629fb701b42cc190 (patch)
treecfc6963180d99e5f36752ca028821aaa109e860d /drivers/gpu/drm/i915/intel_guc_fw.h
parent4f9a4cd66c1201ce2b26ba895b2be63b8b38bb68 (diff)
parent0c8efd610b58cb23cefdfa12015799079aef94ae (diff)
downloadblackbird-obmc-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.gz
blackbird-obmc-linux-95260c17b27e4bdacf85022e629fb701b42cc190.zip
Merge tag 'v4.16-rc5' into devel
Linux 4.16-rc5 merged into the GPIO devel branch to resolve a nasty conflict between fixes and devel in the RCAR driver. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_guc_fw.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud