Merge tag 'drm-misc-fixes-2019-02-13' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Fri, 15 Feb 2019 01:21:46 +0000 (11:21 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 15 Feb 2019 01:21:54 +0000 (11:21 +1000)
commitd586d571ca1af63387af1aa758f66391692cb685
tree88340454d467cb2738ca64ae4060adadcd62bdd6
parentcd4c5a48741056266ff19b2516e5355b5a01abf3
parent7fd56e0260a22c0cfaf9adb94a2427b76e239dd0
Merge tag 'drm-misc-fixes-2019-02-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

drm-misc-fixes for v5.0:
- Fix license inconsistency in vkms.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/812e2f53-d72a-8fba-6c8c-fde8f44cf141@linux.intel.com