summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-25 21:22:15 +0000
committerMark Brown <broonie@linaro.org>2014-03-25 21:22:15 +0000
commitc159a85013afbb8283f0c7272812952e04d5c3a1 (patch)
tree06e05c4c121abce92f5759eaa7d9baa87a25d496
parentbad318cd02e7cacb8e93608f050fa001830ad224 (diff)
parent5f9e6ff66f49d4d791af2b7c9d20727fb8a688e8 (diff)
parent1ca2e8474df3626f8d64d23420f8bd16bcef2448 (diff)
Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next