git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eeab61 2d2f8d5)
Merge mulgrave-w:git/scsi-misc-2.6
authorJames Bottomley <jejb@sparkweed.localdomain>
Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
committerJames Bottomley <jejb@sparkweed.localdomain>
Sat, 23 Sep 2006 20:33:43 +0000 (15:33 -0500)
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>

Trivial merge
Pandora Kernel Repository