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.

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index acb2fa9cf6b1..d719a5d8f435 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3004,7 +3004,7 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
         }
         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