summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:06 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:06 +0100
commite1f059937a2b90a1dbf314959776d3f51b4ab20d (patch)
treeef79490129e24ef09d443b5921794140fe167f66 /include/sound/soc-dapm.h
parent626761ad022c01450330c5774399b35d7fc7a0ac (diff)
parent46172b6c26667133b9945b916b6223cc87bbf10c (diff)
parentc6b424fee7511407107403d3a7c50e0756ae282e (diff)
parent5116ede10dc92d7a11a38fc59f545c24a33809cd (diff)
parentfa41181fe37530d78acb25b4e2c9c019241cbbf6 (diff)
downloadlinux-stable-e1f059937a2b90a1dbf314959776d3f51b4ab20d.tar.gz
linux-stable-e1f059937a2b90a1dbf314959776d3f51b4ab20d.tar.bz2
linux-stable-e1f059937a2b90a1dbf314959776d3f51b4ab20d.zip
Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next