diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:52 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:52 +0200 |
commit | b12a1906be48d1d020e1e20550b93417c7c3d767 (patch) | |
tree | 8e4a9b4e57a6abf9c0d81d99b40c758461874f09 /sound/Makefile | |
parent | Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into ... (diff) | |
parent | ASoC: max98090: Add master clock handling (diff) | |
parent | ASoC: max98095: Add master clock handling (diff) | |
download | linux-b12a1906be48d1d020e1e20550b93417c7c3d767.tar.xz linux-b12a1906be48d1d020e1e20550b93417c7c3d767.zip |
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/max98095' into asoc-next