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-Tag: v2.6.20-rc1~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5faad620264290b17e80a8b0996b039ea0d5ac73;p=pandora-kernel.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
Reading git-diff-tree failed