diff options
author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:48 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:12:48 +0100 |
commit | af4f47717ff17cf81710cbd5dd78f11705204b88 (patch) | |
tree | ac0c6f78564444a4d1584853fd4731bfcba66558 /sound/soc/codecs/nau8825.c | |
parent | af796e3b2c82c7becd38cb08ed262a5e969c95c1 (diff) | |
parent | b286401752c61de9c2335a1c9748243bb53649de (diff) | |
parent | 0d97ee867958a092f02e9cd7c865c278bcec18a6 (diff) | |
parent | 3dfcd3468cf05861654b1c7857500da6c8a9fc88 (diff) | |
parent | f70eab3aad004b7496755ec77763bfd6e2eff553 (diff) | |
parent | e23d834876390d6b8d4d35057e9ecd899a44193a (diff) | |
download | linux-af4f47717ff17cf81710cbd5dd78f11705204b88.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/mtk', 'asoc/topic/mxs', 'asoc/topic/nau8825', 'asoc/topic/nuc900' and 'asoc/topic/of-graph' into asoc-next