summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:12:12 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:12:12 +0000
commit631657c61da1ce9705f2df0c61b3879ad613267b (patch)
treea15ef5c5ea98667a69d3be5abf1d858f4a73ebc4 /sound
parent4c908776466b03ab76033373b30f3152b21ef0a8 (diff)
parentcaaeb6a96f35af14f615838b924f54c9d0f33ab3 (diff)
parentd98123a76be53d570d72e04aac3e195a560ef149 (diff)
parent7195d920bd6094f6810e20a903027cd438bc6d8e (diff)
parent335ca471eebf130d88cb94c1192568b6c75aa9b0 (diff)
parent0eef4ed5970a736bf2449b389fb44f6fe3635765 (diff)
downloadlinux-631657c61da1ce9705f2df0c61b3879ad613267b.tar.bz2
Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/sigmadsp', 'asoc/topic/simple', 'asoc/topic/sirf' and 'asoc/topic/sn95031' into asoc-next