]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:15:34 +0000 (09:15 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 17:15:34 +0000 (09:15 -0800)
* '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  2 
drivers/block/cciss.c

index acb2fa9cf6b1a161c77ac61e3603699333f9f143,2ee4a44423df162fb3104775681f548ac1f12d69..d719a5d8f4355e45905410f4a1c0b506702d5bb4
@@@ -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;
 -
  }
  
  /*