summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-13 15:17:56 +0700
committerMark Brown <broonie@kernel.org>2016-03-13 15:17:56 +0700
commitd4a6360f19c1c551afcba42be98df04651fab31b (patch)
treeaec5c8e4d73747a65dcbec29be6fcea9cda3f89a /include/sound
parentb25d2803e900bde8116b45322e8bb6e84044e249 (diff)
parentf8260afa444b670016f22f2ba1440d9d2e74dcb6 (diff)
parentb6b6e4d670c9285225dc826bf69620f69717ade0 (diff)
parent51b2bb3f2568e6d9d81a001d38b8d70c2ba4af99 (diff)
Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next