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)
commit054838bc019c90511d034fb796dc8c7715460fc2
treea04b9fa86e3cfb8adb285fcd33bd47983f75d8fb
parentd597580d373774b1bdab84b3d26ff0b55162b916
parentfc69910f329d61821897871e0e957eda39beb3d8
Merge commit 'fc69910f329d' into uaccess.mips

backmerge of a build fix from mainline