Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:52 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:52 +0000 (10:39 +0100)

Trivial merge