summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master'Jeff Garzik2005-11-049-14/+33
|\
| * Merge Paulus' treeStephen Rothwell2005-11-025-63/+51
| |\
| | * [PATCH] revert ide-scsi highmem cleanupAndrew Morton2005-10-311-12/+32
| | * Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2005-10-313-51/+18
| | |\
| | * \ Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-10-311-0/+1
| | |\ \
| | | * | Create platform_device.h to contain all the platform device details.Russell King2005-10-291-0/+1
| * | | | merge filename and modify references to iseries/vio.hKelly Daly2005-11-021-1/+1
| * | | | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-021-1/+1
| * | | | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-021-1/+1
| * | | | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-021-1/+1
| |/ / /
| * | | Merge ../linux-2.6 by handPaul Mackerras2005-10-3145-1139/+4678
| |\ \ \
| | * | | [PATCH] fix missing includesTim Schmielau2005-10-304-0/+9
| | * | | [PATCH] Typo fix: explictly -> explicitlyJean Delvare2005-10-301-1/+1
| | * | | [PATCH] ide-scsi highmem cleanupAndrew Morton2005-10-301-26/+12
| * | | | Merge in v2.6.14 by handPaul Mackerras2005-10-286-9/+19
| |\ \ \ \
| * | | | | powerpc: set the driver.owner field for all vio driversStephen Rothwell2005-10-241-1/+2
| * | | | | powerpc: don't duplicate name between vio_driver and device_driverStephen Rothwell2005-10-241-2/+4
* | | | | | Merge branch 'upstream'Jeff Garzik2005-10-303-51/+18
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | [libata] locking rewrite (== fix)Jeff Garzik2005-10-302-3/+8
| * | | | | [libata] ata_tf_to_host cleanupsJeff Garzik2005-10-302-48/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'master'Jeff Garzik2005-10-3016-93/+114
|\| | | |
| * | | | [libata] use dev_printk() throughout driversJeff Garzik2005-10-3014-83/+101
| * | | | [libata ata_piix] fix native mode probe, after recent updatesJeff Garzik2005-10-301-4/+3
| * | | | [libata ata_piix] use dev_printk() where appropriateJeff Garzik2005-10-301-2/+6
| * | | | [libata] fix legacy IDE probingJeff Garzik2005-10-301-4/+4
* | | | | Merge branch 'upstream'Jeff Garzik2005-10-3010-69/+83
|\| | | |
| * | | | [libata] change ata_qc_complete() to take error mask as second argJeff Garzik2005-10-3010-69/+83
* | | | | Merge branch 'upstream'Jeff Garzik2005-10-307-83/+31
|\| | | |
| * | | | Merge branch 'master'Jeff Garzik2005-10-304-21/+22
| |\ \ \ \
| | * \ \ \ Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2005-10-293-14/+7
| | |\ \ \ \
| | | * | | | [PATCH] Use sg_set_buf/sg_init_one where applicableDavid Hardeman2005-10-303-14/+7
| | * | | | | [PATCH] core remove PageReservedNick Piggin2005-10-292-7/+15
| | |/ / / /
| * / / / / [libata] remove ata_chk_err(), ->check_err() hook.Jeff Garzik2005-10-294-67/+9
| |/ / / /
* | | | | Merge branch 'master'Jeff Garzik2005-10-299-46/+67
|\| | | |
| * | | | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-10-291-1/+1
| |\ \ \ \
| | * | | | dec_esp: Use physical addressesMaciej W. Rozycki2005-10-291-1/+1
| * | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2005-10-298-167/+716
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [PATCH] sata_sil24 iomem annotations and fixesAl Viro2005-10-291-16/+19
| | * | | | [PATCH] libata-core cleanups (updated)Randy Dunlap2005-10-291-9/+5
| | * | | | [libata] ensure ->tf_read() hook reads Status and Error registersJeff Garzik2005-10-295-14/+36
| * | | | | [PATCH] sata_sil24 iomem annotations and fixesAl Viro2005-10-291-16/+19
| | |_|_|/ | |/| | |
| * | | | [PATCH] PCI: Convert megaraid to use pci_driver shutdown methodRussell King2005-10-281-6/+4
| * | | | [PATCH] PCI: ipr: Block config access during BISTBrian King2005-10-281-0/+2
* | | | | Merge branch 'upstream'Jeff Garzik2005-10-2810-158/+687
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master'Jeff Garzik2005-10-286-14/+12
| |\| | |
| | * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2005-10-284-8/+8
| | |\ \ \
| | | * \ \ Merge ../bleed-2.6Greg KH2005-10-2832-792/+3808
| | | |\ \ \
| | | * | | | [PATCH] Driver Core: fix up all callers of class_device_create()Greg Kroah-Hartman2005-10-284-4/+4
| | | * | | | [PATCH] Driver core: pass interface to class interface methodsDmitry Torokhov2005-10-281-4/+4
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6Linus Torvalds2005-10-282-6/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |