diff options
author | Mark Brown <broonie@kernel.org> | 2015-07-23 17:42:35 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-07-23 17:42:35 +0100 |
commit | 7593388026b5bcd5f538073e7bf24823169d4d17 (patch) | |
tree | 455efe76e7bd347dd93e6ae19ce6753b3f796fec /sound/soc/codecs/wm5102.c | |
parent | f87a83a3cd5d1d1266aea718022084f7079c418d (diff) | |
parent | cef6daa919c6912c4da629c3cee9c789f90583b1 (diff) | |
parent | 779ea47399bae5d9418451f5283a3b2e35869627 (diff) | |
parent | ca94085139d4874701af4f149bebfb05e105b245 (diff) | |
parent | 36e914cc4bb5d1842e7c8a2e2b9b4f2935771c14 (diff) |
Merge remote-tracking branches 'asoc/topic/wm8731', 'asoc/topic/wm8904', 'asoc/topic/wm8996' and 'asoc/topic/xtensa' into asoc-next