Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl

Browse source

Conflicts:
	sound/soc/fsl/fsl_ssi.c

...

This commit is contained in:

Mark Brown 2015-01-08 19:54:56 +00:00

parent b968d83f09 64aa5f5843

commit 4536a00116

1 changed files with 1 additions and 1 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

2

sound/soc/fsl/fsl_ssi.c

View file