Merge commit 'fc69910f329d' into uaccess.mips
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 6 Apr 2017 06:07:33 +0000 (02:07 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 6 Apr 2017 06:07:33 +0000 (02:07 -0400)
backmerge of a build fix from mainline


Trivial merge