Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
authorMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:07 +0000 (19:17 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 23 Jul 2013 18:17:07 +0000 (19:17 +0100)
commit7c9e061729c0c612f57fe27b7e72cde308263cf0
tree519cba01d4231fb209201b7d11a3e90aa4174077
parent3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b
parent9a9b1c618d835e7a6a4097eb47ee47991202a3c1
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus