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] block layer: ioprio_best function fix
  [PATCH] ide-cd: fix breakage with internally queued commands
  [PATCH] block layer: elv_iosched_show should get elv_list_lock
  [PATCH] splice: fix pipe_to_file() ->prepare_write() error path
  [PATCH] block layer: elevator_find function cleanup
  [PATCH] elevator: elevator_type member not used

...

This commit is contained in:

Linus Torvalds 2006-10-12 07:49:46 -07:00

parent 9ff4680e99 d58cdfb89c

commit da79cbae39

6 changed files with 14 additions and 21 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

1

include/linux/blkdev.h

View file

1

include/linux/elevator.h

View file