diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 09:20:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 09:20:58 -0700 |
| commit | 5b22b1848b7b5c28af8c7e916bbef08d4292a509 (patch) | |
| tree | 01d93ad5e1393fe92978dae6ca51459d2afa43c8 /scripts/kconfig | |
| parent | a930d8790552658140d7d0d2e316af4f0d76a512 (diff) | |
| parent | 190b1ecf257be308f0053c371fa7afa1ba5f4932 (diff) | |
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
Diffstat (limited to 'scripts/kconfig')
0 files changed, 0 insertions, 0 deletions