From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Dec 2011 18:05:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b0d78ee89c4ac1e99dda52f304baf82bd2a6c946;p=deliverable%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't kick empty queue in blk_drain_queue()
  block/swim3: Locking fixes
  loop: Fix discard_alignment default setting
  cfq-iosched: fix cfq_cic_link() race confition
  cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
  cciss: fix flush cache transfer length
  cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
  loop: fix loop block driver discard and encryption comment
  block: initialize request_queue's numa node during
---

b0d78ee89c4ac1e99dda52f304baf82bd2a6c946