Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi

Browse source

Conflicts:
	sound/soc/fsl/Kconfig

...

This commit is contained in:

Mark Brown 2014-06-01 14:02:07 +01:00

parent 4324812201 7b8751abdd

commit 287d414eac

5 changed files with 70 additions and 32 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

82

sound/soc/fsl/Kconfig

View file

9

sound/soc/fsl/fsl_esai.c

View file

9

sound/soc/fsl/fsl_spdif.c

View file

1

sound/soc/fsl/fsl_ssi.c

View file

1

sound/soc/fsl/imx-pcm-dma.c

View file