From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 18 Jun 2007 17:38:09 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Tag: v2.6.22-rc6~90
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4cc21505a09354ade787de368bd697a1bba3b213;p=linux-2.6-omap-h63xx.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING.
  [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive
---

4cc21505a09354ade787de368bd697a1bba3b213