summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:37:01 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:37:01 +0000
commitebfa3dccd2ee17383e68b9c516c47068457a4de7 (patch)
tree12b1a969a44089aeadfbf08576fd199fff2385aa /sound
parent166729f37da174f4ad967ebfc3e6f1517d247e61 (diff)
parent03303da5243f394f5cc5e530a8bc9f26ad2c79cb (diff)
parentfd34045567991dc77a50163c5d0e465b423df962 (diff)
parent98856d5ad89c4bb13544b1f1367a4d8355296a2d (diff)
parentdfa5def56f61ab872768c4759968b7b7ce286e77 (diff)
parentc9b0bdc74735a5173cdce67f8a85f85c2e8bccee (diff)
Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/topology', 'asoc/topic/wm0010', 'asoc/topic/wm8731' and 'asoc/topic/wm8741' into asoc-next