Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc-next

Browse source

...

This commit is contained in:

Mark Brown 2014-03-23 14:00:59 +00:00

parent ca9e54c625 46c39cae29 bfe723f6ea

commit e090d5b6ad

3 changed files with 62 additions and 33 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

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

View file

9

sound/soc/codecs/sirf-audio-codec.c

View file

80

sound/soc/generic/simple-card.c

View file