| commit | 022e5d098b3bcc4a9a75c24e910a08ff9d2321d2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 10 15:19:58 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 10 15:19:58 2013 -0700 |
| tree | 3d73743a2258b03a7e7c5b52500d4d01f75c9424 | |
| parent | 1e24f76e231f2b68b01b61610ec235f7ea331513 [diff] | |
| parent | 58cd57bfd9db3bc213bf9d6a10920f82095f0114 [diff] |
Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux Pull nfsd fixes from Bruce Fields: "Some fixes for a 4.1 feature that in retrospect probably should have waited for 3.12.... But it appears to be working now" * 'for-3.11' of git://linux-nfs.org/~bfields/linux: nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID nfsd4: Fix MACH_CRED NULL dereference