From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 13 Dec 2006 17:15:34 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5faad620264290b17e80a8b0996b039ea0d5ac73;p=linux-beck.git

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.
---

5faad620264290b17e80a8b0996b039ea0d5ac73
diff --cc drivers/block/cciss.c
index acb2fa9cf6b1,2ee4a44423df..d719a5d8f435
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@@ -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;
 -
  }
  
  /*