From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 10 Jan 2011 19:48:02 +0000 (-0500)
Subject: Merge branch 'bugfixes' into nfs-for-2.6.38
X-Git-Tag: v2.6.38-rc1~407^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68c404b18f6fba404b2753622d0459c68ee128ae;p=pandora-kernel.git

Merge branch 'bugfixes' into nfs-for-2.6.38

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

68c404b18f6fba404b2753622d0459c68ee128ae
Reading git-diff-tree failed