summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 00:23:49 +0100
committerMark Brown <broonie@linaro.org>2014-05-22 00:23:49 +0100
commit0c5dacf2ca07a1b9a5970cd06cc5eab496860382 (patch)
tree7fcb6df82eab0738e8d0047ad6e234a2b8660801
parentb03a1c7029079d7e58306ae4daab85db62955984 (diff)
parent3bb40619aca84905f87dd6bc7f6dce9efb525f28 (diff)
parent5958de23edc4148a07a75abf7216a8426b8e199b (diff)
parent24fc81d5fe92e335cd93902a66fb3c4420d99375 (diff)
Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next