Merge branch 'work.drm' into work.__copy_in_user
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 4 Jul 2017 17:31:18 +0000 (13:31 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Tue, 4 Jul 2017 17:31:18 +0000 (13:31 -0400)

Trivial merge