summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-202-2/+2
|\
| * Merge branch 'master' into for-nextJiri Kosina2010-04-23508-700/+1717
| |\
| * | Fix comment and Kconfig typos for 'require' and 'fragment'Gilles Espinasse2010-03-291-1/+1
| * | Fix typos in commentsThomas Weber2010-03-161-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2010-05-201-1/+1
|\ \ \
| * | | PM QOS updateMark Gross2010-05-101-1/+1
* | | | Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2010-05-194-35/+34
|\ \ \ \
| * \ \ \ Merge commit 'v2.6.34-rc6'J. Bruce Fields2010-05-04514-747/+1806
| |\ \ \ \
| * | | | | sunrpc: centralise most calls to svc_xprt_receivedNeil Brown2010-05-033-18/+4
| * | | | | svcrpc: don't hold sv_lock over svc_xprt_put()J. Bruce Fields2010-03-291-1/+1
| * | | | | sunrpc/cache: fix module refcnt leak in a failure pathLi Zefan2010-03-241-1/+3
| * | | | | sunrpc: never return expired entries in sunrpc_cache_lookupNeilBrown2010-03-141-3/+14
| * | | | | sunrpc/cache: factor out cache_is_expiredNeilBrown2010-03-141-5/+8
| * | | | | sunrpc: don't keep expired entries in the auth caches.NeilBrown2010-03-141-8/+5
* | | | | | Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2010-05-1920-322/+2408
|\ \ \ \ \ \
| * | | | | | SUNRPC: Don't spam gssd with upcall requests when the kerberos key expiredTrond Myklebust2010-05-141-12/+53
| * | | | | | SUNRPC: Remove the 'tk_magic' debugging fieldTrond Myklebust2010-05-141-11/+0
| * | | | | | SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqstTrond Myklebust2010-05-144-7/+7
| * | | | | | SUNRPC: Ensure rpcauth_prune_expired() respects the nr_to_scan parameterTrond Myklebust2010-05-141-3/+2
| * | | | | | SUNRPC: Ensure memory shrinker doesn't waste time in rpcauth_prune_expired()Trond Myklebust2010-05-141-5/+7
| * | | | | | SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFSTrond Myklebust2010-05-141-0/+2
| * | | | | | NFS: Don't use GFP_KERNEL in rpcsec_gss downcallsTrond Myklebust2010-05-146-27/+32
| * | | | | | SUNRPC: Fix xs_setup_bc_tcp()Trond Myklebust2010-05-141-3/+0
| * | | | | | SUNRPC: Replace jiffies-based metrics with ktime-based metricsChuck Lever2010-05-143-22/+15
| * | | | | | SUNRPC: RPC metrics and RTT estimator should use same RTT valueChuck Lever2010-05-142-10/+4
| * | | | | | SUNRPC: Fail over more quickly on connect errorsTrond Myklebust2010-05-143-19/+1
| * | | | | | SUNRPC: Move the test for XPRT_CONNECTING into xprt_connect()Trond Myklebust2010-05-143-30/+19
| * | | | | | SUNRPC: Cleanup - make rpc_new_task() call rpc_release_calldata on failureTrond Myklebust2010-05-142-18/+14
| * | | | | | SUNRPC: Clean up xprt_release()Trond Myklebust2010-05-141-16/+16
| * | | | | | gss_krb5: Advertise rc4-hmac enctype support in the rpcsec_gss/krb5 upcallTrond Myklebust2010-05-141-1/+1
| * | | | | | gss_krb5: Add support for rc4-hmac encryptionKevin Coffman2010-05-146-13/+483
| * | | | | | gss_krb5: Use confounder length in wrap codeKevin Coffman2010-05-143-8/+14
| * | | | | | gssd_krb5: More arcfour-hmac supportKevin Coffman2010-05-144-9/+11
| * | | | | | gss_krb5: Save the raw session key in the contextKevin Coffman2010-05-141-14/+13
| * | | | | | gssd_krb5: arcfour-hmac supportKevin Coffman2010-05-144-14/+30
| * | | | | | gss_krb5: Advertise AES enctype support in the rpcsec_gss/krb5 upcallTrond Myklebust2010-05-141-1/+1
| * | | | | | gss_krb5: add remaining pieces to enable AES encryption supportKevin Coffman2010-05-144-12/+358
| * | | | | | gss_krb5: add support for new token formats in rfc4121Kevin Coffman2010-05-144-0/+378
| * | | | | | xdr: Add an export for the helper function write_bytes_to_xdr_buf()Kevin Coffman2010-05-141-0/+1
| * | | | | | gss_krb5: Advertise triple-des enctype support in the rpcsec_gss/krb5 upcallTrond Myklebust2010-05-141-1/+1
| * | | | | | gss_krb5: add support for triple-des encryptionKevin Coffman2010-05-146-0/+83
| * | | | | | gss_krb5: Add upcall info indicating supported kerberos enctypesTrond Myklebust2010-05-142-1/+8
| * | | | | | gss_krb5: handle new context format from gssdKevin Coffman2010-05-142-2/+237
| * | | | | | gss_krb5: import functionality to derive keys into the kernelKevin Coffman2010-05-143-1/+254
| * | | | | | gss_krb5: add ability to have a keyed checksum (hmac)Kevin Coffman2010-05-145-31/+80
| * | | | | | gss_krb5: introduce encryption type frameworkKevin Coffman2010-05-145-69/+182
| * | | | | | gss_krb5: prepare for new context formatKevin Coffman2010-05-141-24/+39
| * | | | | | gss_krb5: split up functions in preparation of adding new enctypesKevin Coffman2010-05-144-12/+68
| * | | | | | gss_krb5: Don't expect blocksize to always be 8 when calculating paddingJ. Bruce Fields2010-05-141-4/+1
| * | | | | | gss_krb5: Added and improved code commentsKevin Coffman2010-05-143-3/+38