Merge branch 'asoc-fix-ep93xx' into spi-fix-ep93xx
authorMark Brown <broonie@kernel.org>
Thu, 26 May 2016 10:13:12 +0000 (11:13 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 26 May 2016 10:13:12 +0000 (11:13 +0100)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge