Linus Torvalds c9059598ea Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block ... * 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block: (153 commits) block: add request clone interface (v2) floppy: fix hibernation ramdisk: remove long-deprecated "ramdisk=" boot-time parameter fs/bio.c: add missing __user annotation block: prevent possible io_context->refcount overflow Add serial number support for virtio_blk, V4a block: Add missing bounce_pfn stacking and fix comments Revert "block: Fix bounce limit setting in DM" cciss: decode unit attention in SCSI error handling code cciss: Remove no longer needed sendcmd reject processing code cciss: change SCSI error handling routines to work with interrupts enabled. cciss: separate error processing and command retrying code in sendcmd_withirq_core() cciss: factor out fix target status processing code from sendcmd functions cciss: simplify interface of sendcmd() and sendcmd_withirq() cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code cciss: Use schedule_timeout_uninterruptible in SCSI error handling code block: needs to set the residual length of a bidi request Revert "block: implement blkdev_readpages" block: Fix bounce limit setting in DM Removed reference to non-existing file Documentation/PCI/PCI-DMA-mapping.txt ... Manually fix conflicts with tracing updates in: block/blk-sysfs.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c include/trace/events/block.h kernel/trace/blktrace.c		2009-06-11 11:10:35 -07:00
..
fc	[SCSI] libfc: Fix compilation warnings with allmodconfig	2009-04-27 10:19:31 -05:00
fc_encode.h	[SCSI] libfc: A modular Fibre Channel library	2008-12-29 11:24:33 -06:00
fc_frame.h	[SCSI] libfc: add support of large receive offload by ddp in fc_fcp	2009-03-13 15:15:15 -05:00
iscsi_if.h	[SCSI] libiscsi_tcp: support padding offload	2008-12-29 11:24:23 -06:00
iscsi_proto.h
libfc.h	[SCSI] libfc: Track rogue remote ports	2009-04-27 10:18:57 -05:00
libfcoe.h	[SCSI] fcoe, libfcoe: Add support for FIP. FCoE discovery and keep-alive.	2009-04-03 09:23:08 -05:00
libiscsi_tcp.h	[SCSI] iscsi_tcp: make padbuf non-static	2009-01-13 10:41:34 -06:00
libiscsi.h	[SCSI] cxgb3i, iser, iscsi_tcp: set target can queue	2009-04-27 10:09:54 -05:00
libsas.h
libsrp.h
osd_attributes.h	[SCSI] libosd: attributes Support	2009-03-12 12:58:07 -05:00
osd_initiator.h	[SCSI] libosd: SCSI/OSD Sense decoding support	2009-03-12 12:58:09 -05:00
osd_protocol.h	[SCSI] libosd: OSD2r05: on-the-wire changes for latest OSD2 revision 5.	2009-04-27 11:05:49 -05:00
osd_sec.h	[SCSI] libosd: OSDv1 Headers	2009-03-12 12:58:06 -05:00
osd_sense.h	[SCSI] libosd: SCSI/OSD Sense decoding support	2009-03-12 12:58:09 -05:00
osd_types.h	[SCSI] libosd: OSDv1 Headers	2009-03-12 12:58:06 -05:00
sas_ata.h
sas.h
scsi_cmnd.h	block: convert to pos and nr_sectors accessors	2009-05-11 09:50:54 +02:00
scsi_dbg.h
scsi_device.h	[SCSI] remove scsi_req_map_sg	2009-03-12 12:58:10 -05:00
scsi_devinfo.h
scsi_dh.h
scsi_driver.h
scsi_eh.h
scsi_host.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
scsi_ioctl.h	[PATCH] don't mess with file in scsi_nonblockable_ioctl()	2008-10-21 07:47:28 -04:00
scsi_netlink_fc.h
scsi_netlink.h
scsi_scan.h	PM/Hibernate: Wait for SCSI devices scan to complete during resume	2009-04-13 11:37:07 -07:00
scsi_tcq.h	scsi: make sure that scsi_init_shared_tag_map() doesn't overwrite existing map	2008-10-27 19:25:30 +01:00
scsi_tgt_if.h
scsi_tgt.h
scsi_transport_fc.h	[SCSI] fc-transport: Close state transition-window during rport deletion.	2009-05-15 12:16:46 -04:00
scsi_transport_iscsi.h	[SCSI] iscsi class: remove host no argument from session creation callout	2009-03-13 15:29:39 -05:00
scsi_transport_sas.h
scsi_transport_spi.h
scsi_transport_srp.h
scsi_transport.h	block: unify request timeout handling	2008-10-09 08:56:13 +02:00
scsi.h	[SCSI] Make scsi.h independent of the rest of the scsi includes	2009-03-12 12:58:13 -05:00
scsicam.h
sg.h
srp.h