tree c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3
parent d035c36c58dd9183ad6aa7875dea89893faedb55
parent 6650239a4b01077e80d5a4468562756d77afaa59
author Trond Myklebust <Trond.Myklebust@netapp.com> 1294688882 -0500
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1294688882 -0500

Merge branch 'bugfixes' into nfs-for-2.6.38

Conflicts:
	fs/nfs/nfs2xdr.c
	fs/nfs/nfs3xdr.c
	fs/nfs/nfs4xdr.c