aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-20115-667/+1677
|\
| * 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
| | * | | gss_krb5: Introduce encryption type frameworkKevin Coffman2010-05-141-0/+25
| * | | | Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2010-05-195-8/+29
| |\ \ \ \
| | * | | | clocksource: Add clocksource_register_hz/khz interfaceJohn Stultz2010-05-101-1/+18
| | * | | | Merge branch 'linus' into timers/coreThomas Gleixner2010-05-10113-346/+826
| | |\ \ \ \
| | * | | | | time: Remove xtime_cacheJohn Stultz2010-04-131-1/+0
| | * | | | | hrtimers: Provide schedule_hrtimeout for CLOCK_REALTIMECarsten Emde2010-04-061-0/+2
| | * | | | | timers: Introduce the concept of timer slack for legacy timersArjan van de Ven2010-04-061-1/+9
| | * | | | | ntp: Remove tickadjJohn Stultz2010-03-231-4/+0
| | * | | | | ntp: Make time_adjust staticJohn Stultz2010-03-231-1/+0
| * | | | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-05-192-1/+32
| |\ \ \ \ \ \
| | * | | | | | genirq: Add CPU mask affinity hintPeter P Waskiewicz Jr2010-05-032-0/+7
| | * | | | | | genirq: Remove IRQF_DISABLED from core codeThomas Gleixner2010-04-131-1/+2
| | * | | | | | genirq: Introduce request_any_context_irq()Marc Zyngier2010-04-131-0/+23
| * | | | | | | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-191-1/+22
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'devel-stable' into develRussell King2010-05-17104-282/+662
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | ARM: 6033/1: ARM: MMCI: pass max frequency from platformLinus Walleij2010-04-141-1/+22
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-05-195-4/+282
| |\ \ \ \ \ \ \ \