Linus Torvalds d99cf9d679 Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block ...

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b84754866.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2006-01-06 09:01:25 -08:00

..

iscsi_if.h

…

iscsi_proto.h

[SCSI] iscsi: rename some proto defs

2005-09-20 12:35:27 -05:00

scsi_cmnd.h

Fix up SCSI mismerge

2005-12-15 20:17:02 -06:00

scsi_dbg.h

[SCSI] Rename scsi_print_msg to spi_print_msg

2005-12-15 18:41:27 -08:00

scsi_device.h

[SCSI] Convert SCSI mid-layer to scsi_execute_async

2005-12-14 19:03:35 -08:00

scsi_devinfo.h

…

scsi_driver.h

[BLOCK] update SCSI to use new blk_ordered for barriers

2006-01-06 09:52:55 +01:00

scsi_eh.h

Merge by hand (conflicts in sd.c)

2005-09-06 17:52:54 -05:00

scsi_host.h

Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

2006-01-06 09:01:25 -08:00

scsi_ioctl.h

…

scsi_request.h

[SCSI] remove scsi_wait_req

2005-11-06 12:45:20 -06:00

scsi_tcq.h

…

scsi_transport_fc.h

[SCSI] fix for fc transport recursion problem.

2005-12-15 19:22:14 -08:00

scsi_transport_iscsi.h

…

scsi_transport_sas.h

[SCSI] sas: add support for PHY resets

2005-10-28 19:08:03 -05:00

scsi_transport_spi.h

[SCSI] Rename scsi_print_msg to spi_print_msg

2005-12-15 18:41:27 -08:00

scsi_transport.h

…

scsi.h

…

scsicam.h

…

sg_request.h

…

sg.h

…

srp.h

IB: Add SCSI RDMA Protocol (SRP) initiator

2005-11-02 14:07:13 -08:00