summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-09-01 12:13:19 +0100
committerMark Brown <broonie@kernel.org>2017-09-01 12:13:19 +0100
commitf5fd4a67bef5f2c5c2c9eb0cb2900e12d192ae23 (patch)
tree509c21660bcd3a5de0c5218b459aac07ef12f00e /sound
parent6f78e0a1b2c96e0567122f0f679b2d327105c070 (diff)
parent6cbcad079ecdb8ecd214d33688fd7f19167fe57a (diff)
parent89b13706c4bb6dae0263014051dd59986376faa5 (diff)
parent66f41da341cd97ad362c4a40e1c9a0a28d746f81 (diff)
Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next