Merge branch 'bugfixes' into nfs-for-2.6.38
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Jan 2011 19:48:02 +0000 (14:48 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Jan 2011 19:48:02 +0000 (14:48 -0500)
commit68c404b18f6fba404b2753622d0459c68ee128ae
treec1ec0bb12f19d91071b461cc2831d9d3dd4c74f3
parentd035c36c58dd9183ad6aa7875dea89893faedb55
parent6650239a4b01077e80d5a4468562756d77afaa59
Merge branch 'bugfixes' into nfs-for-2.6.38

Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
fs/nfs/dir.c
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
include/linux/sunrpc/xdr.h