Merge branch 'asoc-4.17' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 11:27:30 +0000 (12:27 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 5 Jun 2018 11:27:30 +0000 (12:27 +0100)
1  2 
.mailmap
MAINTAINERS

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge