summaryrefslogtreecommitdiffstats
path: root/include (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-204-150/+21
|\
| * pcmcia: remove unused mem_op.hDominik Brodowski2010-05-101-116/+0
| * pcmcia: clarify alloc_io_space, move it to resource handlersDominik Brodowski2010-05-101-2/+9
| * pcmcia: dev_node removal (core)Dominik Brodowski2010-05-101-10/+0
| * pcmcia: clean up cs.hDominik Brodowski2010-05-101-11/+0
| * pcmcia: re-work pcmcia_request_irq()Dominik Brodowski2010-05-102-10/+8
| * pcmcia: pass FORCED_PULSE parameter in pcmcia_request_configuration()Dominik Brodowski2010-05-101-0/+1
| * pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socketDominik Brodowski2010-05-101-4/+3
| * pcmcia: setup IRQ to be used by PCMCIA drivers at card insertDominik Brodowski2010-05-101-0/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2010-05-206-21/+47
|\ \
| * | i2c: Fix bus-level power management callbacksRafael J. Wysocki2010-05-101-0/+7
| * | PM QOS updateMark Gross2010-05-103-7/+14
| * | FS / libfs: Implement simple_write_to_bufferJiri Slaby2010-05-101-0/+2
| * | PM: pm_wakeup - switch to using boolDmitry Torokhov2010-05-101-14/+24
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2010-05-203-2/+16
|\ \
| * | IB/mlx4: Add support for masked atomic operationsVladimir Sokolovsky2010-04-222-2/+9
| * | IB/core: Add support for masked atomic operationsVladimir Sokolovsky2010-04-221-0/+7
* | | 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-201-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-2012-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