tree 3cbf8fb661d61cd59b2a146d22f3f9947d5e79d8
parent 52b3a88439580ec32da58702968c5b70e2638424
parent 9b9ae16a97e08bdc4fd5e726a4d17119dbae5d8a
author Mark Brown <broonie@linaro.org> 1377857069 +0100
committer Mark Brown <broonie@linaro.org> 1377857069 +0100

Merge remote-tracking branch 'asoc/topic/samsung' into tmp