summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-13 11:17:28 +0300
committerMark Brown <broonie@kernel.org>2016-03-13 11:17:28 +0300
commitf2d4c127f75b32aaf2b3c18f6010bbd4086df0b0 (patch)
treedca890865184939882b50c4c85e12e6b0afe5374 /sound
parent88f183484a9419910737cde211f7dbb184171d66 (diff)
parentaa3e838869d494c437c693b54d12fe02b96a0aa1 (diff)
parent568cecf42f35bf40bdf94107fb638997f82827f7 (diff)
downloadlinux-f2d4c127f75b32aaf2b3c18f6010bbd4086df0b0.tar.xz
Merge remote-tracking branches 'asoc/topic/pxa' and 'asoc/topic/qcom' into asoc-next