summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 10:39:55 +0100
committerMark Brown <broonie@linaro.org>2014-06-03 10:39:55 +0100
commit770b65c3da673f39ee00aaf50fcc0f895eda467d (patch)
tree7b9285895c6ef9c17bf670f6f8600b5207625699
parent440a5285589d4abc7f7c44f063a3554557820ab6 (diff)
parentd92950e755328a0293af66e18096e0cae29996f1 (diff)
parent0e826e86726423df5c3841d0a34a2edcd64a93e2 (diff)
Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5677' into asoc-next