Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

Browse source

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

...

This commit is contained in:

Linus Torvalds 2006-04-18 10:36:49 -07:00

parent 6fbe85f914 be3b075354

commit 1c605d6739

2 changed files with 43 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

block/as-iosched.c

View file

53

block/cfq-iosched.c

View file