Merge mulgrave-w:git/linux-2.6
authorJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
committerJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
Conflicts:

include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1  2 
block/ll_rw_blk.c
include/linux/blkdev.h

Simple merge
index 427b0d61be6c03de60cd6216152de92f8dad4539,96c9040c00a87f391148547213d161d3231d341a..c773ee545ebd046a7256c3c13a44a1bb894760b2
@@@ -746,8 -746,7 +746,9 @@@ extern void blk_queue_free_tags(request
  extern int blk_queue_resize_tags(request_queue_t *, int);
  extern void blk_queue_invalidate_tags(request_queue_t *);
  extern long blk_congestion_wait(int rw, long timeout);
 +extern struct blk_queue_tag *blk_init_tags(int);
 +extern void blk_free_tags(struct blk_queue_tag *);
+ extern void blk_congestion_end(int rw);
  
  extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
  extern int blkdev_issue_flush(struct block_device *, sector_t *);