Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/scsi/sd.c
index 32300bedc779b0a8e0f0e9f6420a8a6eff1ffa8a,ef66a15ce361a4e768e18e5b6ea538a1afd594dc..02121a6fd6d56949d78965d96d362f55068d7660
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1491,8 -1546,10 +1491,8 @@@ static void __exit exit_sd(void
                        vfree(sd_dsk_arr[k]);
                vfree(sd_dsk_arr);
        }
 -      for (k = 0; k < N_USED_SD_MAJORS; k++)
 -              blk_dev[SD_MAJOR(k)].queue = NULL;
        sd_template.dev_max = 0;
-       remove_driver(&sd_template.scsi_driverfs_driver);
+       driver_unregister(&sd_template.scsi_driverfs_driver);
  
        unregister_reboot_notifier(&sd_notifier_block);
  }

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge