summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Linux 2.6.18-rc1v2.6.18-rc1Linus Torvalds2006-07-051-2/+2
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-07-051-8/+10
|\
| * [PKT_SCHED]: Fix error handling while dumping actionsThomas Graf2006-07-051-2/+4
| * [PKT_SCHED]: Return ENOENT if action module is unavailableThomas Graf2006-07-051-0/+1
| * [PKT_SCHED]: Fix illegal memory dereferences when dumping actionsThomas Graf2006-07-051-6/+5
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-07-054-6/+25
|\ \
| * | [SPARC64]: Fix stack overflow checking in modular non-SMP kernels.Mikael Pettersson2006-07-051-5/+5
| * | [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.Randy Dunlap2006-07-053-1/+20
| |/
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-07-059-271/+897
|\ \
| * | [PCI] Add JMicron PCI ID constantsJeff Garzik2006-07-051-0/+7
| * | [PATCH] ahci: Ensure that we don't grab both functionsroot2006-07-051-4/+11
| * | [PATCH] libata-core.c: restore configuration boot messages in ata_dev_configu...Borislav Petkov2006-07-051-5/+5
| * | [PATCH] sata_sil24: add suspend/sleep supportTejun Heo2006-07-051-0/+25
| * | [PATCH] sata_sil24: separate out sil24_init_controller()Tejun Heo2006-07-051-45/+62
| * | [PATCH] sata_sil: add suspend/sleep supportTejun Heo2006-07-051-0/+17
| * | [PATCH] sata_sil: separate out sil_init_controller()Tejun Heo2006-07-051-38/+48
| * | [PATCH] libata: reimplement controller-wide PMTejun Heo2006-07-053-7/+298
| * | [PATCH] libata: reimplement per-dev PMTejun Heo2006-07-053-92/+115
| * | [PATCH] libata: implement PM EH actionsTejun Heo2006-07-053-4/+198
| * | [PATCH] libata: separate out __ata_ehi_hotplugged()Tejun Heo2006-07-051-2/+7
| * | [PATCH] libata: implement ATA_EHI_NO_AUTOPSY and QUIETTejun Heo2006-07-053-16/+23
| * | [PATCH] libata: clean up debounce parameters and improve parameter selectionTejun Heo2006-07-053-18/+24
| * | [PATCH] libata: implement ATA_EHI_RESUME_LINKTejun Heo2006-07-053-8/+11
| * | [PATCH] libata: replace ap_lock w/ ap->lock in ata_scsi_error()Tejun Heo2006-07-051-12/+11
| * | [PATCH] libata: fix ehc->i.action setting in ata_eh_autopsy()Tejun Heo2006-07-051-1/+1
| * | [PATCH] libata: add ap->pflags and move core dynamic flags to itTejun Heo2006-07-056-52/+58
| * | [PATCH] libata: Conditionally set host->max_cmd_lenBrian King2006-07-051-6/+15
| * | [PATCH] sata_vsc: data_xfer should use mmioMartin Hicks2006-07-051-1/+1
| |/
* | Merge git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2006-07-059-284/+304
|\ \
| * \ Merge branch 'locks'Trond Myklebust2006-07-054-44/+80
| |\ \
| | * | NLM,NFSv4: Wait on local locks before we put RPC calls on the wireTrond Myklebust2006-07-052-12/+31
| | * | VFS: Add support for the FL_ACCESS flag to flock_lock_file()Trond Myklebust2006-07-051-0/+5
| | * | NFSv4: Ensure nfs4_lock_expired() caches delegated locksTrond Myklebust2006-07-051-3/+5
| | * | NLM,NFSv4: Don't put UNLOCK requests on the wire unless we hold a lockTrond Myklebust2006-07-052-27/+22
| | * | VFS: Allow caller to determine if BSD or posix locks were actually freedTrond Myklebust2006-07-052-2/+17
| * | | NFS: Optimise away an excessive GETATTR call when a file is symlinkedTrond Myklebust2006-07-051-1/+3
| * | | This fixes a panic doing the first READDIR or READDIRPLUS call when:Trond Myklebust2006-07-051-2/+1
| * | | NFS: Fix NFS page_state usageTrond Myklebust2006-07-051-3/+17
| |/ /
| * | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-07-05662-9374/+27110
| |\ \
| * \ \ Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-07-034378-30841/+43279
| |\ \ \
| * \ \ \ Merge branch 'master' of /home/trondmy/kernel/linux-2.6/Trond Myklebust2006-06-28239-2232/+3173
| |\ \ \ \
| * | | | | Revert "Merge branch 'odirect'"Trond Myklebust2006-06-282-234/+203
* | | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2006-07-059-87/+82
|\ \ \ \ \ \
| * | | | | | [ARM] 3711/1: AT91 timer updateAndrew Victor2006-07-054-65/+66
| * | | | | | [ARM] 3709/1: pnx4008: convert to generic irq subsystemVitaly Wool2006-07-054-20/+13
| * | | | | | [ARM] 3710/1: AT91 Serial: Use GPIO APIAndrew Victor2006-07-051-2/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-07-0568-1103/+7760
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [PATCH] myri10ge - Export more parameters to ethtoolBrice Goglin2006-07-051-0/+5
| * | | | | [PATCH] myri10ge - Use dev_info() when printing parameters after probeBrice Goglin2006-07-051-5/+4
| * | | | | [PATCH] myri10ge - Drop ununsed nvidia chipset idbrice@myri.com2006-07-051-2/+0
OpenPOWER on IntegriCloud