summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-27 19:04:54 +0000
committerMark Brown <broonie@kernel.org>2014-11-27 19:04:54 +0000
commit005a0efc2c1548f5406b2bc8fa29dd1ff0124621 (patch)
tree4237c7df6184592c3e3967b7111110c5435c4e6b /sound
parent9c9173d0637e21f561e1f5d05b20cf268ccfe84f (diff)
parent335ca471eebf130d88cb94c1192568b6c75aa9b0 (diff)
parent0eef4ed5970a736bf2449b389fb44f6fe3635765 (diff)
parent5ad72152b695ba5027f9c6ec9a48a8e1a70f25dc (diff)
parent815b776cf5983ab69d548146fb979adac5dec4de (diff)
parent2062c1ff3596e1ae8aafe8082460d03d9a420282 (diff)
Merge remote-tracking branches 'asoc/topic/sirf', 'asoc/topic/sn95031', 'asoc/topic/ssm4567', 'asoc/topic/sta32x' and 'asoc/topic/sta350' into asoc-next