diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 10:02:45 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-28 10:02:45 +0200 |
| commit | 4adda532c05fa74602408cea319dcace884f7c67 (patch) | |
| tree | 4b48b611e1b49981428b73ee7267c61c92d2dd65 | |
| parent | 22f880ca8246c6c80c4f48731c6a7d5d15042f56 (diff) | |
| parent | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (diff) | |
| download | linux-4adda532c05fa74602408cea319dcace884f7c67.tar.gz linux-4adda532c05fa74602408cea319dcace884f7c67.tar.bz2 linux-4adda532c05fa74602408cea319dcace884f7c67.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at -rc4, which we need to land the 4.12 gvt
patches.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>