Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:43 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jun 2008 18:55:43 +0000 (11:55 -0700)
commit5dfd06215b951de70b3e610de47813811c822a44
treea2aed2b23ef48137a8c7b59c36a2e8fbe5d848bf
parentf32c23f59a3af0c5bb9e198386f2e6cd22038e9f
parentf93daa3f7ff4f0cc13acc7452a00feb1c586102a
Merge git://git./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