Merge home.transmeta.com:/home/torvalds/v2.5/blk-plug

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/block/ll_rw_blk.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc mm/page-writeback.c
Simple merge

diff --cc mm/readahead.c
index 1b89bf7afe2e27a8f3ec0f67e03b785a7cf0bb81,dc74e2c4b8c083647e12c89989537bd8f818fdfe..2d4e4af9a23884cd4ff2388b8c4bb2404a13b304
--- 1/mm/readahead.c
--- 2/mm/readahead.c
+++ b/mm/readahead.c
@@@ -167,9 -148,24 +167,9 @@@ void do_page_cache_readahead(struct fil
         * uptodate then the caller will launch readpage again, and
         * will then handle the error.
         */
 -      for (page_idx = 0; page_idx < nr_to_really_read; page_idx++) {
 -              if (list_empty(&page_pool))
 -                      BUG();
 -              page = list_entry(page_pool.prev, struct page, list);
 -              list_del(&page->list);
 -              if (!add_to_page_cache_unique(page, mapping, page->index))
 -                      mapping->a_ops->readpage(file, page);
 -              page_cache_release(page);
 -      }
 -
 -      /*
 -       * Do this now, rather than at the next wait_on_page_locked().
 -       */
 +      read_pages(mapping, &page_pool, nr_to_really_read);
-       run_task_queue(&tq_disk);
+       blk_run_queues();
 -
 -      if (!list_empty(&page_pool))
 -              BUG();
 -
 +      BUG_ON(!list_empty(&page_pool));
        return;
  }
  

diff --cc mm/vmscan.c
Simple merge