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)
* '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()


Trivial merge