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)
commita2dd3793a1c3ac709f1d7b48ad7751563f4c654f
tree81280559aad138fe997a3b4af205729093927b81
parentd8725c86aebaf3516e220760aaf5fefc73825188
parent53d5864bc673288f03bb7892a3cffa41a173082b
Merge remote-tracking branch 'dh/afs' into for-davem
net/rxrpc/ar-internal.h
net/rxrpc/ar-output.c