Merge mulgrave-w:git/scsi-misc-2.6

Browse Source

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>

...

This commit is contained in:

James Bottomley

2006-09-23 15:33:43 -05:00

parent 3eeab61aa3 2d2f8d59b1

commit c9802cd957

125 changed files with 25925 additions and 1209 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

849

drivers/scsi/iscsi_tcp.c

File diff suppressed because it is too large Load Diff