aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/armada
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-03 11:09:25 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-03 11:09:36 +0100
commit17aad8a340e6f98b62c2482d02bc3814eebde9a5 (patch)
treeb03fc5a159452bd24cde6e08f29bc66ce6bfa154 /drivers/gpu/drm/armada
parentdrm: Fix build when FBDEV_EMULATION is disabled (diff)
parentMerge branch 'drm-etnaviv-next' of https://git.pengutronix.de/git/lst/linux into drm-next (diff)
downloadlinux-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.tar.xz
linux-dev-17aad8a340e6f98b62c2482d02bc3814eebde9a5.zip
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Yet another backmerge to get at latest etnaviv code, which is need for Chris' drm_mm patch. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/armada')
0 files changed, 0 insertions, 0 deletions