git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8d30726
802eee9
)
Merge tag 'v3.13-rc6' into for-3.14/core
author
Jens Axboe
<axboe@kernel.dk>
Tue, 31 Dec 2013 16:51:02 +0000
(09:51 -0700)
committer
Jens Axboe
<axboe@kernel.dk>
Tue, 31 Dec 2013 16:51:02 +0000
(09:51 -0700)
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
Trivial merge