Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 19:59:27 +0000 (11:59 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 3 Jan 2008 19:59:27 +0000 (11:59 -0800)
commit3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6
tree949e577cdb14a51de5075505502ed30d277f5c50
parentb8c9a18712f7b617fda66d878ce3759c9e575ba0
parent751bf4d7865e4ced406be93b04c7436d866d3684
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] scsi_sysfs: restore prep_fn when ULD is removed
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_priv.h