git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1429d7c
0d2602c
)
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
author
Jens Axboe
<axboe@fb.com>
Mon, 19 May 2014 17:52:35 +0000
(11:52 -0600)
committer
Jens Axboe
<axboe@fb.com>
Mon, 19 May 2014 17:52:35 +0000
(11:52 -0600)
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/blk-mq-tag.c
Trivial merge