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

Browse source

...

This commit is contained in:

Mark Brown 2014-03-25 21:22:15 +00:00

parent c61e9e8c47 6a91a17bd7

commit bad318cd02

2 changed files with 183 additions and 79 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

42

Documentation/devicetree/bindings/sound/simple-card.txt

View file

224

sound/soc/generic/simple-card.c

View file