git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c7d1ba4
e7e2450
)
Merge branch 'blk-mq/core' into for-3.13/core
author
Jens Axboe
<axboe@kernel.dk>
Fri, 8 Nov 2013 16:08:12 +0000
(09:08 -0700)
committer
Jens Axboe
<axboe@kernel.dk>
Fri, 8 Nov 2013 16:08:12 +0000
(09:08 -0700)
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-timeout.c
Trivial merge