Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Jun 2007 17:38:09 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 18 Jun 2007 17:38:09 +0000 (10:38 -0700)
commit4cc21505a09354ade787de368bd697a1bba3b213
tree98a6a6348803ed92c8a2a2f15dd792f2bc886ef8
parentcaec4e8dc85e0644ec24aeb36285e1ba02da58cc
parent204abf28679cd55a8e254b18965583bb1c8bc739
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] ESP: Don't forget to clear ESP_FLAG_RESETTING.
  [SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive