diff options
author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:35 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:35 +0000 |
commit | 8ebdab65feea540984495a1a22f3d14d9b99af76 (patch) | |
tree | e39ea2553b0b3721235f9d766bafc69458e9cc31 /sound/soc/codecs/Makefile | |
parent | 1ab4f8519afc6aca3a9fb03a21b1d8625be43ebb (diff) | |
parent | 34015f5e56c71bbdcf7189430ffb63ea67656a35 (diff) | |
parent | 95fe9597d2494e8c4c9064fca1e12d1c03733ae7 (diff) | |
parent | 5547ba616b964de05ba48ec4d529ed1ac22a4326 (diff) | |
parent | 50860e1d17d1bc2f1a2ebfc5042f2af786e53ad6 (diff) | |
download | op-kernel-dev-8ebdab65feea540984495a1a22f3d14d9b99af76.zip op-kernel-dev-8ebdab65feea540984495a1a22f3d14d9b99af76.tar.gz |
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/adsp', 'asoc/topic/ak4613' and 'asoc/topic/atmel' into asoc-next