From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 4 Jun 2007 20:31:39 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Tag: v3.12-rc1~29173
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07;p=kernel%2Fkernel-generic.git

Merge /linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS
  [SCSI] atari_NCR5380: update_timeout removal
  [SCSI] aacraid: fix shutdown handler to also disable interrupts.
  [SCSI] qla2xxx: fix timeout in qla2x00_down_timeout
  [SCSI] fix CONFIG_SCSI_WAIT_SCAN=m
---

a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07