summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/imx-audmux.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-11 00:31:10 +0300
committerMark Brown <broonie@kernel.org>2017-11-11 00:31:10 +0300
commit67e85d4e4e2eaf9614cf4db981be704890eb2869 (patch)
tree250005865e161bd61bf63669f36880be79f93aac /sound/soc/fsl/imx-audmux.h
parentf2470d52913883e0c34e4121a498087493198b4c (diff)
parent4c75968a1bbfb3f190e2e624c83929451e4730ac (diff)
parente0d746cc0155a51cc24eb56286cd21a2c5aa4985 (diff)
parent0c8b794c4a10aaf7ac0d4a49be2b2638e2038adb (diff)
parentbb19ba2a345439b4de3f6d59819da9853500ac4d (diff)
downloadlinux-67e85d4e4e2eaf9614cf4db981be704890eb2869.tar.xz
Merge remote-tracking branches 'asoc/topic/cygnus', 'asoc/topic/da7213', 'asoc/topic/davinci' and 'asoc/topic/doc' into asoc-next