From: James Bottomley <jejb@sparkweed.localdomain>
Date: Sat, 23 Sep 2006 20:33:43 +0000 (-0500)
Subject: Merge mulgrave-w:git/scsi-misc-2.6
X-Git-Tag: v2.6.19-rc1~1266^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9802cd9574a80444e689c7525627b40d7dc3a06;p=pandora-kernel.git

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>
---

c9802cd9574a80444e689c7525627b40d7dc3a06
Reading git-diff-tree failed