Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@kernel.org>
Mon, 17 Nov 2014 16:41:05 +0000 (16:41 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 17 Nov 2014 16:41:05 +0000 (16:41 +0000)

Trivial merge