tree 2ea4f3ab1d3766204a55ec26600b848ed3a7e8aa
parent f884dcaead5f17bf586ac5fe6a3ad07b5203616a
parent cccddf4f5580131c9b963900e1d3400655e633cc
author Trond Myklebust <Trond.Myklebust@netapp.com> 1250720512 -0400
committer Trond Myklebust <Trond.Myklebust@netapp.com> 1250720512 -0400

Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32

Conflicts:
	fs/nfs/nfs4xdr.c