From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Thu, 21 Dec 2006 08:03:38 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.20-rc2~79
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4604096768d3be37ee1a05aee424aceed3e1b56f;p=~shefty%2Frdma-dev.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] block: document io scheduler allow_merge_fn hook
  [PATCH] cfq-iosched: don't allow sync merges across queues
  [PATCH] Fixup blk_rq_unmap_user() API
  [PATCH] __blk_rq_unmap_user() fails to return error
  [PATCH] __blk_rq_map_user() doesn't need to grab the queue_lock
  [PATCH] Remove queue merging hooks
  [PATCH] ->nr_sectors and ->hard_nr_sectors are not used for BLOCK_PC requests
  [PATCH] cciss: fix XFER_READ/XFER_WRITE in do_cciss_request
  [PATCH] cciss: set default raid level when reading geometry fails
---

4604096768d3be37ee1a05aee424aceed3e1b56f