| commit | 023265ed75d8792ca1d555430a8985511d3f8788 | [log] [tgz] |
|---|---|---|
| author | Jani Nikula <jani.nikula@intel.com> | Wed Dec 11 10:35:37 2019 +0200 |
| committer | Jani Nikula <jani.nikula@intel.com> | Wed Dec 11 11:13:50 2019 +0200 |
| tree | 0940ba6f005f102062e5842b4ec8073ecd583ac0 | |
| parent | 2b68392e638dfa5cf4f7b558f62e3ea4def2e605 [diff] | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a [diff] |
Merge drm/drm-next into drm-intel-next-queued Sync up with v5.5-rc1 to get the updated lock_release() API among other things. Fix the conflict reported by Stephen Rothwell [1]. [1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.au Signed-off-by: Jani Nikula <jani.nikula@intel.com>