tree a2aed2b23ef48137a8c7b59c36a2e8fbe5d848bf
parent f32c23f59a3af0c5bb9e198386f2e6cd22038e9f
parent f93daa3f7ff4f0cc13acc7452a00feb1c586102a
author Linus Torvalds <torvalds@linux-foundation.org> 1213815343 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213815343 -0700

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