Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: 
James Bottomley <James.Bottomley@SteelEye.com>
No related branches found
No related tags found
Showing
- Documentation/scsi/ChangeLog.arcmsr 56 additions, 0 deletionsDocumentation/scsi/ChangeLog.arcmsr
- Documentation/scsi/arcmsr_spec.txt 574 additions, 0 deletionsDocumentation/scsi/arcmsr_spec.txt
- Documentation/scsi/libsas.txt 484 additions, 0 deletionsDocumentation/scsi/libsas.txt
- block/ll_rw_blk.c 88 additions, 21 deletionsblock/ll_rw_blk.c
- drivers/block/DAC960.c 1 addition, 1 deletiondrivers/block/DAC960.c
- drivers/block/cciss_scsi.c 5 additions, 9 deletionsdrivers/block/cciss_scsi.c
- drivers/infiniband/ulp/iser/iscsi_iser.c 4 additions, 14 deletionsdrivers/infiniband/ulp/iser/iscsi_iser.c
- drivers/infiniband/ulp/iser/iscsi_iser.h 0 additions, 1 deletiondrivers/infiniband/ulp/iser/iscsi_iser.h
- drivers/message/fusion/mptfc.c 84 additions, 16 deletionsdrivers/message/fusion/mptfc.c
- drivers/message/fusion/mptsas.c 14 additions, 5 deletionsdrivers/message/fusion/mptsas.c
- drivers/scsi/BusLogic.c 37 additions, 9 deletionsdrivers/scsi/BusLogic.c
- drivers/scsi/Kconfig 31 additions, 1 deletiondrivers/scsi/Kconfig
- drivers/scsi/Makefile 5 additions, 0 deletionsdrivers/scsi/Makefile
- drivers/scsi/a2091.c 3 additions, 3 deletionsdrivers/scsi/a2091.c
- drivers/scsi/a2091.h 0 additions, 4 deletionsdrivers/scsi/a2091.h
- drivers/scsi/a3000.c 4 additions, 4 deletionsdrivers/scsi/a3000.c
- drivers/scsi/a3000.h 0 additions, 4 deletionsdrivers/scsi/a3000.h
- drivers/scsi/aacraid/aachba.c 40 additions, 14 deletionsdrivers/scsi/aacraid/aachba.c
- drivers/scsi/aacraid/aacraid.h 4 additions, 1 deletiondrivers/scsi/aacraid/aacraid.h
- drivers/scsi/aacraid/commctrl.c 19 additions, 6 deletionsdrivers/scsi/aacraid/commctrl.c
Loading
Please register or sign in to comment