Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus
authorMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:37 +0000 (20:42 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Mar 2015 20:42:37 +0000 (20:42 +0000)

Trivial merge