Git Repo - linux.git/commit

]> Git Repo - linux.git/commit

author	James Bottomley <[email protected]>
	Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
committer	James Bottomley <[email protected]>
	Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
commit	c9802cd9574a80444e689c7525627b40d7dc3a06
tree	5954e2ac7e97023b51d36127963a1e9262fbcfe0	tree \| snapshot
parent	3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a	commit \| diff
parent	2d2f8d59b14bec6c745e219a350ac51d9e00673f	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 <[email protected]>

Empty description

RSS Atom

This page took 0.067329 seconds and 4 git commands to generate.

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