tree 4b9756a68d246c59713b8c0946ad7f86e3f12787
parent 5464389755b78e235c999c2dcf58718d23326d46
parent 48dcf1d82fd8158ac8a9b843abb4965c69a19781
author Mark Brown <broonie@linaro.org> 1371486033 +0100
committer Mark Brown <broonie@linaro.org> 1371486033 +0100

Merge remote-tracking branch 'asoc/topic/x86' into asoc-next