Merge branch 'bugfixes' into linux-next

author Trond Myklebust <Trond.Myklebust@netapp.com>

Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)

committer Trond Myklebust <Trond.Myklebust@netapp.com>

Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)
author Trond Myklebust <Trond.Myklebust@netapp.com>
Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)
committer Trond Myklebust <Trond.Myklebust@netapp.com>
Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)
diff --cc fs/nfs/nfs4_fs.h
Simple merge
diff --cc fs/nfs/nfs4xdr.c
Simple merge
diff --cc fs/nfs/write.c
Simple merge
diff --cc net/sunrpc/rpc_pipe.c
Simple merge
author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 4 Dec 2012 21:54:37 +0000 (16:54 -0500)
		1	2
fs/nfs/nfs4_fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4xdr.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/write.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/rpc_pipe.c	patch \|	diff1 \|	diff2 \|	blob \| history