Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 17:36:49 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 17:36:49 +0000 (10:36 -0700)
commit1c605d67395e118ba003c8b061067eca205faf3a
treec667905c3f119b6421d8622a160788d2fdaf919e
parent6fbe85f914ad08cc43408a40ad18a561222e1b93
parentbe3b075354e170368a0d29558cae492205e80a64
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] cfq: Further rbtree traversal and cfq_exit_queue() race fix
  [PATCH 2/2] cfq: fix cic's rbtree traversal
  [PATCH 1/2] iosched: fix typo and barrier()