Merge remote-tracking branch 'dh/afs' into for-davem

author Al Viro <viro@zeniv.linux.org.uk>

Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)

committer Al Viro <viro@zeniv.linux.org.uk>

Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
diff --cc net/rxrpc/ar-internal.h
Simple merge
diff --cc net/rxrpc/ar-output.c
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Sat, 11 Apr 2015 19:51:09 +0000 (15:51 -0400)
		1	2
net/rxrpc/ar-internal.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/rxrpc/ar-output.c	patch \|	diff1 \|	diff2 \|	blob \| history