diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-07 12:54:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-07 12:54:40 +0200 |
| commit | 63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (patch) | |
| tree | 34150d2e7ac4eb6c00f4bc96991947f71a338a0d /sound/soc/codecs/ak4641.c | |
| parent | spi: fsl-dspi: Add ~50ns delay between cs and sck (diff) | |
| parent | spi: fsl-dspi: Fix clock rate scale values (diff) | |
| download | linux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.tar.xz linux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.zip | |
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Conflicts:
drivers/spi/spi-fsl-dspi.c
Diffstat (limited to 'sound/soc/codecs/ak4641.c')
0 files changed, 0 insertions, 0 deletions