| commit | ef426c103892eed94a9bb0ee59c2d0e6eac5179f | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Jan 04 11:41:10 2017 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Jan 04 11:41:10 2017 +0100 |
| tree | 2d998f23fa6e3b3c51f4829f1f881b42e79b7c04 | |
| parent | a402eae64d0ad12b1c4a411f250d6c161e67f623 [diff] | |
| parent | 9b8b75de4cb379187c481a5332a12429f31c0887 [diff] |
Merge tag 'drm-misc-next-2016-12-30' of git://anongit.freedesktop.org/git/drm-misc into drm-intel-next-queued Directly merge drm-misc into drm-intel since Dave is on vacation and we need the various drm-misc patches (fb format rework, drm mm fixes, selftest framework and others). Also pulled back -rc2 in first to resync with drm-intel-fixes and make sure I can reuse the exact rerere solutions from drm-tip for safety, and because I'm lazy. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>