| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 | [log] [tgz] |
|---|---|---|
| author | James Bottomley <jejb@sparkweed.localdomain> | Sat Sep 23 15:33:43 2006 -0500 |
| committer | James Bottomley <jejb@sparkweed.localdomain> | Sat Sep 23 15:33:43 2006 -0500 |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a [diff] | |
| parent | 2d2f8d59b14bec6c745e219a350ac51d9e00673f [diff] |
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>