summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:49:09 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:49:09 +0100
commita5448c88b812390a3622e76d774e10c0da1fb970 (patch)
tree40f87e20d02f7c34f9cad5399c220cb81af20af0 /sound
parent978d4ddb9ed2fe272d66219e109afe6e8eb090a9 (diff)
parentff495d3a8ea4d46d237096e6521b24b7ba612e53 (diff)
parent77c545398e33a0263a68142fcfbd4b11b0f06294 (diff)
parentdfe8f1f3f22f9922e773ae64f5621f290cb26023 (diff)
downloadlinux-a5448c88b812390a3622e76d774e10c0da1fb970.tar.bz2
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next