From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 19 Aug 2009 22:21:52 +0000 (-0400)
Subject: Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32
X-Git-Tag: v2.6.32-rc1~412^2~48^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a396f67d2442e30150ffb5e1142dbb2f2181d3f;p=pandora-kernel.git

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

Conflicts:
	fs/nfs/nfs4xdr.c
---

6a396f67d2442e30150ffb5e1142dbb2f2181d3f
Reading git-diff-tree failed