summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 10:10:29 +0300
committerMark Brown <broonie@kernel.org>2015-02-09 10:10:29 +0300
commit1bf9f29a05ed027dfc3527966321bda33a77ebc3 (patch)
tree05c97c420ca49515051196ffc52716e8f5702a97 /sound
parentddaaeee0e598aa98b2e6a1847003c78665714926 (diff)
parentf9911803e82a32c126c40dd6246ade2faf472cbc (diff)
parent3c9390ad0fa642f42e437feae1c75bdd21e8e1bc (diff)
parente46c93669349072f5caca853f5618cfa01b86008 (diff)
parenta37f1b8fdc912600c24f9d0d45d7046e50a031e4 (diff)
parentb8255930e0fbda841890ff6bb7154aa5fd62e143 (diff)
downloadlinux-1bf9f29a05ed027dfc3527966321bda33a77ebc3.tar.xz
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sta32x', 'asoc/topic/tdm-slot', 'asoc/topic/tegra' and 'asoc/topic/tlv320aic3x' into asoc-next