Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:07 +0000 (18:55 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:07 +0000 (18:55 +0100)

Trivial merge