diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-11-08 17:08:12 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-11-08 17:08:12 +0100 |
| commit | e37459b8e2c7db6735e39e019e448b76e5e77647 (patch) | |
| tree | a3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b /fs/fscache/object.c | |
| parent | block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff) | |
| parent | blk-mq: don't disallow request merges for req->special being set (diff) | |
| download | linux-e37459b8e2c7db6735e39e019e448b76e5e77647.tar.xz linux-e37459b8e2c7db6735e39e019e448b76e5e77647.zip | |
Merge branch 'blk-mq/core' into for-3.13/core
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-timeout.c
Diffstat (limited to 'fs/fscache/object.c')
0 files changed, 0 insertions, 0 deletions