]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:07:00 +0000 (14:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:07:00 +0000 (14:07 -0800)
commitffaa60d5fe1d30b618b0feb22c79486c26a16ea0
treee4c2d26c7565c7cee36065753db09467a27e0339
parentefa82bab8e3509bb2c4a8044de5909b8bab96cfd
parent531c2dc70d339c5dfa8c3eb628c3459dc6f3a075
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