Merge remote-tracking branch 'asoc/topic/symmetry' into asoc-core

Browse source

Conflicts (Trivial add/delete):
	sound/soc/soc-pcm.c

...

This commit is contained in:

Mark Brown 2013-12-04 11:54:29 +00:00

parent 0b4bbae85e 62e5f676f6

commit 07ac582c85

3 changed files with 138 additions and 21 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

6

include/sound/soc-dai.h

View file

2

include/sound/soc.h

View file

151

sound/soc/soc-pcm.c

View file