]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8c9a18 751bf4d)
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)
* 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

1  2 
drivers/scsi/scsi_lib.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_priv.h patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/scsi_lib.c
Simple merge
diff --cc drivers/scsi/scsi_priv.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.