Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Fixup cciss error handling
  [PATCH] Allow as-iosched to be unloaded
  [PATCH 2/2] cciss: remove calls to pci_disable_device
  [PATCH 1/2] cciss: map out more memory for config table
  [PATCH] Propagate down request sync flag

Resolve trivial whitespace conflict in drivers/block/cciss.c manually.

diff --combined drivers/block/cciss.c
index acb2fa9cf6b1a161c77ac61e3603699333f9f143,2ee4a44423df162fb3104775681f548ac1f12d69..d719a5d8f4355e45905410f4a1c0b506702d5bb4
--- 1/drivers/block/cciss.c
--- 2/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@@ -1039,7 -1039,7 +1039,7 @@@ static int cciss_ioctl(struct inode *in
                                status = -ENOMEM;
                                goto cleanup1;
                        }
 -                      buff_size = (int *)kmalloc(MAXSGENTRIES * sizeof(int),
 +                      buff_size = kmalloc(MAXSGENTRIES * sizeof(int),
                                                   GFP_KERNEL);
                        if (!buff_size) {
                                status = -ENOMEM;
@@@ -3004,13 -3004,10 +3004,13 @@@ static int cciss_pci_init(ctlr_info_t *
        }
        return 0;
  
--      err_out_free_res:
++err_out_free_res:
 +      /*
 +       * Deliberately omit pci_disable_device(): it does something nasty to
 +       * Smart Array controllers that pci_enable_device does not undo
 +       */
        pci_release_regions(pdev);
        return err;
 -
  }
  
  /*
@@@ -3383,10 -3380,6 +3383,10 @@@ static int __devinit cciss_init_one(str
                if (drv->queue)
                        blk_cleanup_queue(drv->queue);
        }
 +      /*
 +       * Deliberately omit pci_disable_device(): it does something nasty to
 +       * Smart Array controllers that pci_enable_device does not undo
 +       */
        pci_release_regions(pdev);
        pci_set_drvdata(pdev, NULL);
        free_hba(i);
@@@ -3456,10 -3449,6 +3456,10 @@@ static void __devexit cciss_remove_one(
  #ifdef CONFIG_CISS_SCSI_TAPE
        kfree(hba[i]->scsi_rejects.complete);
  #endif
 +      /*
 +       * Deliberately omit pci_disable_device(): it does something nasty to
 +       * Smart Array controllers that pci_enable_device does not undo
 +       */
        pci_release_regions(pdev);
        pci_set_drvdata(pdev, NULL);
        free_hba(i);