summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2010-05-202-181/+1
|\
| * Merge branch 'next' into for-linusJames Morris2010-05-182-181/+1
| |\
| | * Merge branch 'master' into nextJames Morris2010-05-062-1/+2
| | |\
| | * \ Merge branch 'master' into nextJames Morris2010-05-0677-194/+585
| | |\ \
| | * | | LSM Audit: rename LSM_AUDIT_NO_AUDIT to LSM_AUDIT_DATA_NONEEric Paris2010-04-281-1/+1
| | * | | security: remove dead hook acctEric Paris2010-04-121-14/+0
| | * | | security: remove dead hook key_session_to_parentEric Paris2010-04-121-20/+0
| | * | | security: remove dead hook task_setgroupsEric Paris2010-04-121-12/+0
| | * | | security: remove dead hook task_setgidEric Paris2010-04-121-20/+0
| | * | | security: remove dead hook task_setuidEric Paris2010-04-121-20/+0
| | * | | security: remove dead hook cred_commitEric Paris2010-04-121-11/+0
| | * | | security: remove dead hook inode_deleteEric Paris2010-04-121-11/+0
| | * | | security: remove dead hook sb_post_pivotrootEric Paris2010-04-121-11/+0
| | * | | security: remove dead hook sb_post_addmountEric Paris2010-04-121-13/+0
| | * | | security: remove dead hook sb_post_remountEric Paris2010-04-121-13/+0
| | * | | security: remove dead hook sb_umount_busyEric Paris2010-04-121-11/+0
| | * | | security: remove dead hook sb_umount_closeEric Paris2010-04-121-10/+0
| | * | | security: remove sb_check_sb hooksEric Paris2010-04-121-14/+0
* | | | | Merge branch 'for-2.6.35' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2010-05-191-3/+3
|\ \ \ \ \
| * \ \ \ \ Merge commit 'v2.6.34-rc6'J. Bruce Fields2010-05-04168-445/+1278
| |\ \ \ \ \
| * | | | | | nfsd: further comment typosJ. Bruce Fields2010-05-031-2/+2
| * | | | | | nfsd4: fix filehandle commentJ. Bruce Fields2010-04-221-2/+2
* | | | | | | Merge branch 'nfs-for-2.6.35' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2010-05-1912-36/+238
|\ \ \ \ \ \ \
| * | | | | | | SUNRPC: Don't spam gssd with upcall requests when the kerberos key expiredTrond Myklebust2010-05-142-0/+2
| * | | | | | | SUNRPC: Reorder the struct rpc_task fieldsTrond Myklebust2010-05-141-6/+6
| * | | | | | | SUNRPC: Remove the 'tk_magic' debugging fieldTrond Myklebust2010-05-141-3/+0
| * | | | | | | SUNRPC: Move the task->tk_bytes_sent and tk_rtt to struct rpc_rqstTrond Myklebust2010-05-142-5/+5
| * | | | | | | NFS: Don't use GFP_KERNEL in rpcsec_gss downcallsTrond Myklebust2010-05-142-3/+6
| * | | | | | | SUNRPC: Replace jiffies-based metrics with ktime-based metricsChuck Lever2010-05-143-6/+9
| * | | | | | | ktime: introduce ktime_to_ms()Chuck Lever2010-05-141-2/+8
| * | | | | | | SUNRPC: RPC metrics and RTT estimator should use same RTT valueChuck Lever2010-05-141-1/+0
| * | | | | | | SUNRPC: Trivial cleanups in include/linux/sunrpc/xdr.hChuck Lever2010-05-141-3/+5
| * | | | | | | NFSv4: Clean up the NFSv4 setclientid operationTrond Myklebust2010-05-142-1/+5
| * | | | | | | SUNRPC: Fail over more quickly on connect errorsTrond Myklebust2010-05-141-2/+1
| * | | | | | | NFS: Reduce stack footprint of nfs_proc_remove()Trond Myklebust2010-05-141-1/+1
| * | | | | | | NFS: Add helper functions for allocating filehandles and fattr structsTrond Myklebust2010-05-141-0/+14
| * | | | | | | gss_krb5: Add support for rc4-hmac encryptionKevin Coffman2010-05-141-0/+9
| * | | | | | | gss_krb5: Use confounder length in wrap codeKevin Coffman2010-05-141-0/+3
| * | | | | | | gssd_krb5: More arcfour-hmac supportKevin Coffman2010-05-141-2/+3
| * | | | | | | gss_krb5: Save the raw session key in the contextKevin Coffman2010-05-141-0/+1
| * | | | | | | gssd_krb5: arcfour-hmac supportKevin Coffman2010-05-141-2/+2
| * | | | | | | gss_krb5: add remaining pieces to enable AES encryption supportKevin Coffman2010-05-141-0/+20
| * | | | | | | gss_krb5: add support for new token formats in rfc4121Kevin Coffman2010-05-141-0/+28
| * | | | | | | gss_krb5: add support for triple-des encryptionKevin Coffman2010-05-141-0/+5
| * | | | | | | gss_krb5: Add upcall info indicating supported kerberos enctypesTrond Myklebust2010-05-141-0/+2
| * | | | | | | gss_krb5: handle new context format from gssdKevin Coffman2010-05-141-2/+21
| * | | | | | | gss_krb5: import functionality to derive keys into the kernelKevin Coffman2010-05-141-0/+31
| * | | | | | | gss_krb5: add ability to have a keyed checksum (hmac)Kevin Coffman2010-05-141-3/+8
| * | | | | | | gss_krb5: introduce encryption type frameworkKevin Coffman2010-05-141-1/+24
| * | | | | | | gss_krb5: split up functions in preparation of adding new enctypesKevin Coffman2010-05-141-0/+1
OpenPOWER on IntegriCloud