tree 5954e2ac7e97023b51d36127963a1e9262fbcfe0
parent 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a
parent 2d2f8d59b14bec6c745e219a350ac51d9e00673f
author James Bottomley <jejb@sparkweed.localdomain> 1159043623 -0500
committer James Bottomley <jejb@sparkweed.localdomain> 1159043623 -0500

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>