]> err.no Git - linux-2.6/commitdiff
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Oct 2006 14:49:46 +0000 (07:49 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Oct 2006 14:49:46 +0000 (07:49 -0700)
* '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


Trivial merge