Merge remote-tracking branch 'dh/afs' into for-davem
authorAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)

Trivial merge