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 [PATCH] aoe: cleanup i_rdev usage 2006-07-10 13:24:25 -07:00
paride Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
DAC960.c [SCSI] DAC960: PCI id table fixup 2006-08-04 09:29:17 -04:00
DAC960.h
Kconfig [PATCH] ramdisk blocksize Kconfig entry 2006-07-14 21:53:53 -07:00
Makefile
acsi.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
acsi_slm.c
amiflop.c
ataflop.c
cciss.c [PATCH] cciss: version update, new hw 2006-09-13 07:32:16 -07:00
cciss.h
cciss_cmd.h
cciss_scsi.c [SCSI] Improve inquiry printing 2006-08-06 15:59:26 -05:00
cciss_scsi.h
cpqarray.c [PATCH] drivers/block/cpqarray.c: remove an unused variable 2006-07-14 21:53:53 -07:00
cpqarray.h
cryptoloop.c [BLOCK] cryptoloop: Use block ciphers where applicable 2006-09-21 11:45:53 +10:00
floppy.c [PATCH] exit early in floppy_init when no floppy exists 2006-09-01 11:39:08 -07:00
ida_cmd.h
ida_ioctl.h
loop.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
nbd.c [PATCH] nbd: Abort request on data reception failure 2006-07-31 13:28:39 -07:00
pktcdvd.c [PATCH] lockdep: annotate pktcdvd natural device hierarchy 2006-07-31 13:28:39 -07:00
ps2esdi.c [PATCH] irq-flags: drivers/block Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
rd.c [PATCH] ramdisk blocksize Kconfig entry 2006-07-14 21:53:53 -07:00
smart1,2.h
swim3.c [POWERPC] Update the SWIM3 (powermac) floppy driver 2006-07-03 17:25:26 +10:00
swim_iop.c
sx8.c [PATCH] irq-flags: drivers/block Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
ub.c
umem.c [PATCH] irq-flags: drivers/block Use the new IRQF_ constants 2006-07-02 13:58:49 -07:00
viodasd.c
xd.c
xd.h
z2ram.c