projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2989b3c b06078d)
Merge branch 'drm/du/next' of git://linuxtv.org/pinchartl/media into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 15 May 2018 05:23:47 +0000 (15:23 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 15 May 2018 05:23:48 +0000 (15:23 +1000)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2792436.F0zlxykWp6@avalon
1  2 
drivers/gpu/drm/rcar-du/rcar_du_drv.h patch | diff1 | diff2 | blob | history
drivers/gpu/drm/rcar-du/rcar_du_kms.c patch | diff1 | diff2 | blob | history
drivers/gpu/drm/rcar-du/rcar_du_vsp.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/rcar-du/rcar_du_drv.h
Simple merge
diff --cc drivers/gpu/drm/rcar-du/rcar_du_kms.c
Simple merge
diff --cc drivers/gpu/drm/rcar-du/rcar_du_vsp.c
Simple merge