Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
authorMark Brown <broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000 (06:12 +0900)
committerMark Brown <broonie@kernel.org>
Tue, 1 May 2018 21:12:18 +0000 (06:12 +0900)
commit783ec5e99ab9d8839957b15b5836e8bb795d74b6
tree3b25befe45a3cbf67692fc388da49929f9bfaa85
parent9e6a469ec7dabc73043522d21e634583d91cb567
parent40c57963789d451c26269e3bc9f9e803060fd9af
Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
conflict between a fix and new development in mtk