linux/drivers/block
James Bottomley c9802cd957 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>
2006-09-23 15:33:43 -05:00
..
aoe
paride
acsi_slm.c
acsi.c
amiflop.c
ataflop.c
cciss_cmd.h
cciss_scsi.c
cciss_scsi.h
cciss.c [PATCH] cciss: version update, new hw 2006-09-13 07:32:16 -07:00
cciss.h
cpqarray.c
cpqarray.h
cryptoloop.c [BLOCK] cryptoloop: Use block ciphers where applicable 2006-09-21 11:45:53 +10:00
DAC960.c
DAC960.h
floppy.c
ida_cmd.h
ida_ioctl.h
Kconfig
loop.c
Makefile
nbd.c
pktcdvd.c
ps2esdi.c
rd.c
smart1,2.h
swim3.c
swim_iop.c
sx8.c
ub.c
umem.c
viodasd.c
xd.c
xd.h
z2ram.c