From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Feb 2010 22:07:00 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: Ubuntu-5.0.0-8.9~24273
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ffaa60d5fe1d30b618b0feb22c79486c26a16ea0;p=mirror_ubuntu-disco-kernel.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:
  cciss: Make cciss_seq_show handle holes in the h->drv[] array
  cfq-iosched: split seeky coop queues after one slice
---

ffaa60d5fe1d30b618b0feb22c79486c26a16ea0