Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/io' and 'asoc/topic/kirkwood' into asoc-next

Browse source

...

This commit is contained in:

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

parent e22c3980b9 546d4dd3bb 657254714a cece565690

commit cca1b08ff6

5 changed files with 60 additions and 64 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

9

Documentation/devicetree/bindings/sound/armada-370db-audio.txt

View file

51

sound/soc/intel/mfld_machine.c

View file

1

sound/soc/kirkwood/Kconfig

View file

28

sound/soc/kirkwood/armada-370-db.c

View file

35

sound/soc/soc-io.c

View file