From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 19 Feb 2007 21:32:28 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v2.6.21-rc1~68
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5fc77247f7db01b6377a5ea6ab18c8ac60021045;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
  [SCSI] SCSI core: better initialization for sdev->scsi_level
  [SCSI] scsi_proc.c: display sdev->scsi_level correctly
  [SCSI] megaraid_sas: update version and author info
  [SCSI] megaraid_sas: return sync cache call with success
  [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
  [SCSI] megaraid_sas: add bios_param in scsi_host_template
  [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
  [SCSI] scsi_transport.h should include scsi_device.h
  [SCSI] aic79xx: remove extra newline from info message
  [SCSI] scsi_scan.c: handle bad inquiry responses
  [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
  [SCSI] lpfc: add PCI error recovery support
  [SCSI] megaraid: pci_module_init to pci_register_driver
  [SCSI] tgt: fix the user/kernel ring buffer interface
  [SCSI] sgiwd93: interfacing to wd33c93
  [SCSI] wd33c93: Fast SCSI with WD33C93B
---

5fc77247f7db01b6377a5ea6ab18c8ac60021045