diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-22 11:24:30 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-22 11:24:30 +0200 |
commit | dacdd369113cb7ba91b8e70b09456ca6cdcc2184 (patch) | |
tree | a501e73bff94cae26cb2a29bdaa3f1f6877a830c /sound/soc/codecs/max98090.c | |
parent | Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next (diff) | |
parent | ASoC: intel: Constify ACPI device ids (diff) | |
parent | ASoC: max98090: Constify ACPI device ids and register defaults (diff) | |
download | linux-dacdd369113cb7ba91b8e70b09456ca6cdcc2184.tar.xz linux-dacdd369113cb7ba91b8e70b09456ca6cdcc2184.zip |
Merge remote-tracking branches 'asoc/topic/intel' and 'asoc/topic/max98090' into asoc-next