| commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 | [log] [tgz] |
|---|---|---|
| author | Jani Nikula <jani.nikula@intel.com> | Wed May 02 12:20:32 2018 +0300 |
| committer | Jani Nikula <jani.nikula@intel.com> | Wed May 02 12:20:32 2018 +0300 |
| tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 | |
| parent | 043477b088d2af61a0937754c6560002237e6741 [diff] | |
| parent | 0ab390262c4920f26f8202063a268d5fc829728e [diff] |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>