diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:11 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:11 +0000 |
commit | d40d19447b602bf49d7909eb3c2fe6426fad98ce (patch) | |
tree | e3de253e10f3e53ea71c64f35a35daf9a92fde01 /sound/soc/dwc/designware_i2s.c | |
parent | 6d5c729daba6af6997d66a2a635fd1ec519c7f5c (diff) | |
parent | 2f1a11e624d0e8f02282204adfc2a1d374d49fb5 (diff) | |
parent | acae254a8e08b9406e62d456000ebd1573af0cb6 (diff) | |
parent | 180cf794d4f5e0e82a4df30b8bacd9b472f80f44 (diff) | |
parent | 4536a00116f084cf20ec77f3540c481c02ad8d0e (diff) | |
parent | 888c819d0feb9975216978c797ca7f8dfd48ed08 (diff) |
Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/fsl-asrc' into asoc-next