diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-02 06:12:18 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-02 06:12:18 +0900 |
| commit | 783ec5e99ab9d8839957b15b5836e8bb795d74b6 (patch) | |
| tree | 3b25befe45a3cbf67692fc388da49929f9bfaa85 /sound/soc/fsl/fsl_ssi.h | |
| parent | 9e6a469ec7dabc73043522d21e634583d91cb567 (diff) | |
| parent | 40c57963789d451c26269e3bc9f9e803060fd9af (diff) | |
Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
conflict between a fix and new development in mtk
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.h')
0 files changed, 0 insertions, 0 deletions