]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge by hand (conflicts in sd.c)
authorJames Bottomley <jejb@titanic.(none)>
Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Tue, 6 Sep 2005 22:52:54 +0000 (17:52 -0500)
commit17fa53da1239b8712c5cebbd72a74c713b6c2db9
tree8cf55e47ce681a6c899ccf8e06abeccecb20d38b
parent3173d8c342971a03857d8af749a3f57da7d06b57
parentfe1b2d544d71300f8e2d151c3c77a130d13a58be
Merge by hand (conflicts in sd.c)
drivers/scsi/Kconfig
drivers/scsi/aic7xxx/aic7xxx_osm.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_ioctl.c
drivers/scsi/sd.c
drivers/scsi/sg.c
drivers/scsi/st.c
include/scsi/scsi_eh.h