linux/drivers/infiniband
James Bottomley c9802cd957 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>
2006-09-23 15:33:43 -05:00
..
core IB: Fix typo in kerneldoc for ib_set_client_data() 2006-09-22 15:22:58 -07:00
hw IB/mthca: Simplify calls to mthca_cq_clean() 2006-09-22 15:22:55 -07:00
ulp Merge mulgrave-w:git/scsi-misc-2.6 2006-09-23 15:33:43 -05:00
Kconfig RDMA/amso1100: Add driver for Ammasso 1100 RNIC 2006-09-22 15:22:48 -07:00
Makefile RDMA/amso1100: Add driver for Ammasso 1100 RNIC 2006-09-22 15:22:48 -07:00