summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:58:18 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:58:18 +0100
commitc009d370dd35eb29a8c14f6eb50a4da4276db3f1 (patch)
treea6d7222bafa62e0066944e45b4dfb76a3241f7ce /sound
parent428157c1e8c9eaf0029430ae82ec0df8578de46b (diff)
parent95e3c2305b79e9c0e5f2cb0090efca397249b51f (diff)
parentef3355d22046f4b2c00b0fdf964d6c92fd3f050d (diff)
parent4313489c25622b05adac55dbb9590fb5674c3f45 (diff)
parent0a3dcb509ae7701ba3eaf470cad91827821daf41 (diff)
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/uda134x', 'asoc/topic/ux500' and 'asoc/topic/width' into asoc-next