diff options
author | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:26:14 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:26:14 -0400 |
commit | c829a33253e018472335b02e6d8bb1bb4213a142 (patch) | |
tree | 3da5ab428f3d9f0812f288d32d8893a3f16868b9 | |
parent | 9c4ad466d1dd2e067d5fdb2fcdbcc30fc5c145f9 (diff) | |
parent | e1b489d207c73e67810659a88c45b8db4bd62773 (diff) |
Merge airlied/drm-next into drm-misc-next
Backmerging in order to pull vmwgfx [1] and the new synopsys media
format [2] reqs.
[1]- http://patchwork.freedesktop.org/patch/msgid/20170331233255.GA38850@syeh-m02
[2]- http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay
Signed-off-by: Sean Paul <seanpaul@chromium.org>