alistair23-linux/drivers/scsi/mpt2sas
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
..
mpi [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
Kconfig [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
Makefile [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
mpt2sas_base.c [SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time 2009-04-27 10:54:00 -05:00
mpt2sas_base.h [SCSI] mpt2sas: fix driver version inconsistency 2009-05-18 14:17:17 -05:00
mpt2sas_config.c [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
mpt2sas_ctl.c [SCSI] mpt2sas : release diagnotic buffers prior host reset 2009-04-27 10:54:04 -05:00
mpt2sas_ctl.h [SCSI] mpt2sas : release diagnotic buffers prior host reset 2009-04-27 10:54:04 -05:00
mpt2sas_debug.h [SCSI] mpt2sas v00.100.11.15 2009-03-13 16:08:49 -05:00
mpt2sas_scsih.c [SCSI] mpt2sas: fix hotplug event processing 2009-04-27 10:54:15 -05:00
mpt2sas_transport.c block: set rq->resid_len to blk_rq_bytes() on issue 2009-05-19 11:36:08 +02:00