From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sat, 3 Mar 2012 20:04:15 +0000 (-0500)
Subject: Merge commit 'nfs-for-3.3-4' into nfs-for-next
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8aa0a410af8011d557877e558f9ff17c082c6840;p=linux-edison.git

Merge commit 'nfs-for-3.3-4' into nfs-for-next

Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
---

8aa0a410af8011d557877e558f9ff17c082c6840