From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 21:32:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.38-rc1~48
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=6ab82196492a0b6968a654a06aae923b28afef0d;p=cascardo%2Flinux.git

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: restore multiple bd_link_disk_holder() support
  block cfq: compensate preempted queue even if it has no slice assigned
  block cfq: make queue preempt work for queues from different workload
---

6ab82196492a0b6968a654a06aae923b28afef0d