diff options
author | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:40 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-12-23 00:23:40 +0000 |
commit | 9764350d712d8c0bfb41da5bfd52ba7458b245ec (patch) | |
tree | 970c48b84d8baacd00e70fc1624be1c55488725b /sound/soc/fsl/fsl-asoc-card.c | |
parent | 64dc98d374967ca1a17e0dfa1ec040d7f9d09e12 (diff) | |
parent | 906c7d690c3b80e4321178c083db8c14afb56bf8 (diff) | |
parent | 0032e9dbc5d8add10345ccda48e3803bb7cfd650 (diff) | |
parent | 34e684fa04fadd513e028fa48123f357deac77e8 (diff) | |
parent | 25e5ef974c33f1e4a07a68bf830e6493ee6dab11 (diff) | |
parent | a2a4d6049aa18c0e105d9b53e3236cb50ea5bfa1 (diff) | |
download | linux-9764350d712d8c0bfb41da5bfd52ba7458b245ec.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dwc', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc' and 'asoc/topic/fsl-esai' into asoc-next