Merge mulgrave-w:git/scsi-misc-2.6
authorJames Bottomley <jejb@sparkweed.localdomain>
Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
committerJames Bottomley <jejb@sparkweed.localdomain>
Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
commitc9802cd9574a80444e689c7525627b40d7dc3a06
tree5954e2ac7e97023b51d36127963a1e9262fbcfe0
parent3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a
parent2d2f8d59b14bec6c745e219a350ac51d9e00673f
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>
drivers/infiniband/ulp/iser/iscsi_iser.c
drivers/infiniband/ulp/iser/iscsi_iser.h
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
include/linux/pci_ids.h