Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

Browse source

...

This commit is contained in:

Mark Brown 2014-05-22 00:23:42 +01:00

parent 1450da3cf6 94986198f5

commit 6bf88ab2ec

2 changed files with 58 additions and 119 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

7

include/sound/soc-dapm.h

View file

198

sound/soc/soc-dapm.c

View file