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)
commit64a071331ac773d39a20e266fc640cc7cd99277e
tree1e5a0f8a73437e801f0f90626f9ecc49cc207b31
parent13a7a6ac0a11197edcd0f756a035f472b42cdf8b
parentd7a6fe015b2abe33565538a3faf757e095e094e7
Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus