]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaede7548d0d6735bf6a4ca87ce149e6c1525c833
tree949e577cdb14a51de5075505502ed30d277f5c50
parent56547685cf0a5561bc7709aed2a157039efba799
parentbbf13ce2a48c9c17ac962426b36670eca0a41f98
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] scsi_sysfs: restore prep_fn when ULD is removed
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_priv.h