From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 18 Apr 2006 17:36:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c605d67395e118ba003c8b061067eca205faf3a;p=linux-2.6

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

1c605d67395e118ba003c8b061067eca205faf3a