summaryrefslogtreecommitdiff
path: root/Documentation/ia64
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-05-19 17:52:35 (GMT)
committerJens Axboe <axboe@fb.com>2014-05-19 17:52:35 (GMT)
commit39a9f97e5ea99e048c4980c23cf197f6e77995cb (patch)
treeb1f72ed1e852372b6d86b79157b09f77fabc5a20 /Documentation/ia64
parent1429d7c9467e1e3de0b0ff91d7e4d67c1a92f8a3 (diff)
parent0d2602ca30e410e84e8bdf05c84ed5688e0a5a44 (diff)
downloadlinux-39a9f97e5ea99e048c4980c23cf197f6e77995cb.tar.xz
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
Signed-off-by: Jens Axboe <axboe@fb.com> Conflicts: block/blk-mq-tag.c
Diffstat (limited to 'Documentation/ia64')
0 files changed, 0 insertions, 0 deletions