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)
commitda79cbae39516e7bdee8b0edb366e8ff016a9d3e
tree44ebc3f7d3dc1e0c9495b9749eec186daecdb948
parent9ff4680e9958508bebc5c683b98f37b66617e088
parentd58cdfb89ce0c6bd5f81ae931a984ef298dbda20
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] 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