diff options
| author | Jens Axboe <axboe@kernel.dk> | 2013-12-31 11:51:02 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-12-31 11:51:02 -0500 |
| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 (patch) | |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 /Documentation/DocBook/device-drivers.tmpl | |
| parent | 8d30726912cb39c3a3ebde06214d54861f8fdde2 (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into for-3.14/core
Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.
Fixup merge issues related to the immutable biovec changes.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/logfs/dev_bdev.c
Diffstat (limited to 'Documentation/DocBook/device-drivers.tmpl')
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index 6c9d9d37c83a..f5170082bdb3 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | </sect1> | 58 | </sect1> |
| 59 | <sect1><title>Wait queues and Wake events</title> | 59 | <sect1><title>Wait queues and Wake events</title> |
| 60 | !Iinclude/linux/wait.h | 60 | !Iinclude/linux/wait.h |
| 61 | !Ekernel/wait.c | 61 | !Ekernel/sched/wait.c |
| 62 | </sect1> | 62 | </sect1> |
| 63 | <sect1><title>High-resolution timers</title> | 63 | <sect1><title>High-resolution timers</title> |
| 64 | !Iinclude/linux/ktime.h | 64 | !Iinclude/linux/ktime.h |