From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2008 18:55:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Tag: v2.6.26-rc7~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5dfd06215b951de70b3e610de47813811c822a44;p=~shefty%2Frdma-dev.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] dpt_i2o: Add PROC_IA64 define
  [SCSI] scsi_host regression: fix scsi host leak
  [SCSI] sr: fix corrupt CD data after media change and delay
---

5dfd06215b951de70b3e610de47813811c822a44