Skip to content

Commit

Permalink
Merge branch 'for-4.2/core' into for-4.2/drivers
Browse files Browse the repository at this point in the history
  • Loading branch information
Jens Axboe committed Jun 5, 2015
2 parents 36a7e99 + 3f21c26 commit b281ebb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/linux/blkdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b281ebb

Please sign in to comment.