summaryrefslogtreecommitdiff
path: root/block/blk-ioc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-19 02:59:48 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-19 02:59:48 (GMT)
commit484c60e206b03fe19129dc6ec4582142293cd876 (patch)
treeacc3e37a87704133d4a7c55c57136f737356c41a /block/blk-ioc.c
parent06d30f0208576f3cf2a0ee2072c1408e392038b4 (diff)
parentec6f34e5b552fb0a52e6aae1a5afbbb1605cc6cc (diff)
downloadlinux-484c60e206b03fe19129dc6ec4582142293cd876.tar.xz
Merge 3.19-rc5 into staging-next
We want the staging fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block/blk-ioc.c')
0 files changed, 0 insertions, 0 deletions