Merge mulgrave.(none):/home/jejb/BK/linux-2.5

into mulgrave.(none):/home/jejb/BK/scsi-misc-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/block/scsi_ioctl.c
Simple merge

diff --cc drivers/scsi/sd.c
index d84dbfb24be2034714fe0859ab446fc815c4b2f9,e614aa640d56b9122d4367986490fb440bc7509a..f44e96df0ad9a0ef0763f04a77756439c331269d
--- 1/drivers/scsi/sd.c
--- 2/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1418,14 -1418,8 +1416,8 @@@ static int sd_probe(struct device *dev
                goto out;
  
        memset (sdkp, 0, sizeof(*sdkp));
 -      kref_init(&sdkp->kref, scsi_disk_release);
 +      kref_init(&sdkp->kref);
  
-       /* Note: We can accomodate 64 partitions, but the genhd code
-        * assumes partitions allocate consecutive minors, which they don't.
-        * So for now stay with max 16 partitions and leave two spare bits. 
-        * Later, we may change the genhd code and the alloc_disk() call
-        * and the ->minors assignment here.    KG, 2004-02-10
-        */ 
        gd = alloc_disk(16);
        if (!gd)
                goto out_free;

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