From: James Bottomley <jejb@sparkweed.localdomain>
Date: Sun, 24 Sep 2006 02:03:52 +0000 (-0500)
Subject: Merge mulgrave-w:git/linux-2.6
X-Git-Tag: v2.6.19-rc1~1266^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aedf2ccc60fade26c46fae12e28664d0da3f199;p=linux-2.6

Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
---

1aedf2ccc60fade26c46fae12e28664d0da3f199
diff --cc include/linux/blkdev.h
index 427b0d61be,96c9040c00..c773ee545e
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -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 *);