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 25910 additions and 1194 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

2

include/linux/blkdev.h

View file

5

include/linux/module.h

View file

2

include/linux/netlink.h

View file

17

include/linux/pci_ids.h

View file