summaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:16:10 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:16:10 +0900
commit512def88cb67915edce1081327c0b280f02fbf19 (patch)
treec280d4c5bc514353202a8ed52535df3a0db12a35 /sound/soc/sh
parent3db5de560ce6d404e9c1377512f2d93245cd048a (diff)
parentb415b4d3122a466f3a73d86a1dd2dcdc13de7ef3 (diff)
parent0f7e17740612ca0f3b8baf91645075d07bb52b2c (diff)
parentb3f2dcddd576a2a6e59c407109610206c4062c8f (diff)
parentdc6d84c69cf8296b1e8e2fd0b1e115b7787ef4e9 (diff)
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rl6347a', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next