diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 19:49:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 19:49:06 +0100 |
commit | e1f059937a2b90a1dbf314959776d3f51b4ab20d (patch) | |
tree | ef79490129e24ef09d443b5921794140fe167f66 /include/sound/soc.h | |
parent | 626761ad022c01450330c5774399b35d7fc7a0ac (diff) | |
parent | 46172b6c26667133b9945b916b6223cc87bbf10c (diff) | |
parent | c6b424fee7511407107403d3a7c50e0756ae282e (diff) | |
parent | 5116ede10dc92d7a11a38fc59f545c24a33809cd (diff) | |
parent | fa41181fe37530d78acb25b4e2c9c019241cbbf6 (diff) | |
download | op-kernel-dev-e1f059937a2b90a1dbf314959776d3f51b4ab20d.zip op-kernel-dev-e1f059937a2b90a1dbf314959776d3f51b4ab20d.tar.gz |
Merge remote-tracking branches 'asoc/topic/link-param', 'asoc/topic/max98090', 'asoc/topic/max98925' and 'asoc/topic/nuc900' into asoc-next