tree 1e5a0f8a73437e801f0f90626f9ecc49cc207b31
parent 13a7a6ac0a11197edcd0f756a035f472b42cdf8b
parent d7a6fe015b2abe33565538a3faf757e095e094e7
author Mark Brown <broonie@kernel.org> 1425501757 +0000
committer Mark Brown <broonie@kernel.org> 1425501757 +0000

Merge remote-tracking branch 'asoc/fix/atmel-build' into asoc-linus