diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-16 13:03:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-16 13:03:14 +0100 |
commit | 016e81f2029cd89fcf71bd6324cb0eda9c56ec5d (patch) | |
tree | 6410d0b2b9efe50d8bfd462f66406442f034edde /sound/soc/fsl | |
parent | Linux 4.0-rc4 (diff) | |
parent | ASoC: Intel: remove conflicts when load/unload multiple firmware images (diff) | |
download | linux-016e81f2029cd89fcf71bd6324cb0eda9c56ec5d.tar.xz linux-016e81f2029cd89fcf71bd6324cb0eda9c56ec5d.zip |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound/soc/fsl')
0 files changed, 0 insertions, 0 deletions