From: James Morris <jmorris@namei.org>
Date: Thu, 4 Dec 2008 06:16:36 +0000 (+1100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.6.29-rc1~588^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec98ce480ada787f2cfbd696980ff3564415505b;p=pandora-kernel.git

Merge branch 'master' into next

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>
---

ec98ce480ada787f2cfbd696980ff3564415505b
Reading git-diff-tree failed