Merge branch 'work.const-qstr' into work.misc
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 14:44:55 +0000 (10:44 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 8 Oct 2016 14:44:55 +0000 (10:44 -0400)

Trivial merge