Merge HEAD from ../scsi-iscsi-2.6
authorJames Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Thu, 8 Sep 2005 14:37:35 +0000 (09:37 -0500)
commitf5c7f03113fc9c547012cf403aec4b534d575ef0
tree255bd4ff0c5a9314be427cf0695349ac432f9d7c
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9
parent471417c9cfb4c2574e2c03bf2273fe12f5388a8e
Merge HEAD from ../scsi-iscsi-2.6
drivers/scsi/Kconfig
drivers/scsi/Makefile