Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
authorMark Brown <broonie@kernel.org>
Tue, 12 May 2015 19:31:32 +0000 (20:31 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 12 May 2015 19:31:32 +0000 (20:31 +0100)

Trivial merge