diff options
author | Mark Brown <broonie@kernel.org> | 2017-08-01 15:17:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-08-01 15:17:06 +0100 |
commit | 440174aca84d6aec1a75d6d79c276c7c65b14296 (patch) | |
tree | d5a1924ee8f6cac7f2e6a4318c962f7195b66f3d /sound/soc/soc-pcm.c | |
parent | 7e5fed09ddbb7d0f16af0ebdaca2c22b0a2fed77 (diff) | |
parent | b1cd2e34c69a2f3988786af451b6e17967c293a0 (diff) | |
parent | ae1fbdff6dbcdfee9daee69fa1e7d26d1f31d1c7 (diff) | |
parent | deab4563ad6a7f4668024455fa61b87f1d25ff73 (diff) | |
parent | 651e9268fb9b9944e063d731b09c0d2ad339bedb (diff) | |
parent | c0a480d1acf7dc184f9f3e7cf724483b0d28dc2e (diff) | |
parent | ac1ca3ba9faae7e32f189edda14f6f147053d719 (diff) | |
download | linux-440174aca84d6aec1a75d6d79c276c7c65b14296.tar.bz2 |
Merge remote-tracking branches 'asoc/fix/dpcm', 'asoc/fix/imx', 'asoc/fix/msm8916', 'asoc/fix/multi-pcm', 'asoc/fix/of-graph' and 'asoc/fix/pxa' into asoc-linus