diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-13 14:27:01 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:27:01 +0100 |
commit | 180bc41ad11b9a7ec5b420fbcef6570163d09204 (patch) | |
tree | be81bfa63cf00738240ae72e12a8933dc2d37b56 /sound/soc/codecs/twl6040.h | |
parent | e449f7a394dfa444d2e3c15be2cffb758c79a6c9 (diff) | |
parent | ca0d8797397c5daa6260a6c67b845d79f65140f5 (diff) | |
parent | fbb88b5ca1dc84416fc1fec34773948b6780492c (diff) | |
parent | aeea2fdd9b623fcd6991ac3617ef6a3b646c2899 (diff) | |
parent | 4d2458507d0b465c62ae80f3e81b8c008ec96b05 (diff) | |
parent | 027db2e122db81b055a2b569d72f2f1d29c4d007 (diff) |
Merge remote-tracking branches 'asoc/topic/es8328', 'asoc/topic/find-dai', 'asoc/topic/fsl', 'asoc/topic/fsl-sai' and 'asoc/topic/fsl-ssi' into asoc-next