Merge remote-tracking branches 'asoc/topic/img' and 'asoc/topic/max98090' into asoc...
authorMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:36:32 +0000 (16:36 +0000)
committerMark Brown <broonie@kernel.org>
Sun, 19 Feb 2017 16:36:32 +0000 (16:36 +0000)

Trivial merge