summaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-29 22:44:27 +0300
committerMark Brown <broonie@kernel.org>2016-09-29 22:44:27 +0300
commit3b495e4bf34b5e4ad2658e08694493e6068e2e5d (patch)
tree12d4e7b853d8fabca877043849bf1a2fac1922ea /block/blk-merge.c
parentee61b892980329ccebf3a9da9ae32442c3d14f4f (diff)
parent408ef7e18097810f160629447e6ebe979a0b4282 (diff)
parent349fa18c061a485a7928e9d3b998d464deaea8c4 (diff)
parent478cc9f93c28dccd1db373a4c996fefb5d67b072 (diff)
parent22e766146a5ae744b0e95d80f663a9aab9c189fb (diff)
downloadlinux-3b495e4bf34b5e4ad2658e08694493e6068e2e5d.tar.xz
Merge remote-tracking branches 'asoc/topic/max98371', 'asoc/topic/max9867', 'asoc/topic/max98926' and 'asoc/topic/mtk' into asoc-next