git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	James Bottomley <jejb@sparkweed.localdomain>
	Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
committer	James Bottomley <jejb@sparkweed.localdomain>
	Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
commit	852c0e1442cd3686d0b441c5c7191b272fe28b8a
tree	5954e2ac7e97023b51d36127963a1e9262fbcfe0	tree \| snapshot
parent	e25e80c99facf0d04e065e452bc55ed9f66fed75	commit \| diff
parent	88cf73afe3e1e293b9393da07aa107e0ac3bbccf	commit \| 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>

Linux Kernel Source Tree.

RSS Atom

drivers/infiniband/ulp/iser/iscsi_iser.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/iser/iscsi_iser.h	diff1 \|	diff2 \|	blob \| history
drivers/scsi/iscsi_tcp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/iscsi_tcp.h	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history