Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:41 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:41 +0000 (18:54 +0100)

Trivial merge