From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Mar 2013 16:20:58 +0000 (-0700)
Subject: Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b22b1848b7b5c28af8c7e916bbef08d4292a509;p=linux-beck.git

Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Some minor fallout from the user-namespace work broke most krb5 mounts
  to nfsd, and I screwed up a change to the AF_LOCAL rpc code."

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  sunrpc: don't attempt to cancel unitialized work
  nfsd: fix krb5 handling of anonymous principals
---

5b22b1848b7b5c28af8c7e916bbef08d4292a509