From: Linus Torvalds Date: Sat, 10 Aug 2013 22:19:58 +0000 (-0700) Subject: Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux X-Git-Tag: v3.11-rc5~7 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=022e5d098b3bcc4a9a75c24e910a08ff9d2321d2 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 --- 022e5d098b3bcc4a9a75c24e910a08ff9d2321d2