From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 3 Jan 2008 19:59:27 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
X-Git-Tag: v2.6.24-rc7~14
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6;p=sfrench%2Fcifs-2.6.git

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
---

3a62b5f3cdaa00413e25fa6d6b6816e2c67f92f6