Merge branch 'for-4.2/core' into for-4.2/drivers

This commit is contained in:
Jens Axboe 2015-06-05 10:58:28 -06:00
commit b281ebb817

View file

@ -1024,6 +1024,7 @@ bool __must_check blk_get_queue(struct request_queue *);
struct request_queue *blk_alloc_queue(gfp_t);
struct request_queue *blk_alloc_queue_node(gfp_t, int);
extern void blk_put_queue(struct request_queue *);
extern void blk_set_queue_dying(struct request_queue *);
/*
* block layer runtime pm functions