Merge remote-tracking branches 'asoc/topic/intel' and 'asoc/topic/max98090' into asoc-next

Browse source

...

This commit is contained in:

Mark Brown 2015-06-22 10:24:30 +01:00

parent 1cdf4f6113 e85dae7048 8610d09a40

commit dacdd36911

6 changed files with 45 additions and 19 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

4

sound/soc/codecs/max98090.c

View file

4

sound/soc/intel/Kconfig

View file

20

sound/soc/intel/atom/sst-atom-controls.c

View file

4

sound/soc/intel/atom/sst/sst.c

View file

30

sound/soc/intel/boards/cht_bsw_max98090_ti.c

View file

2

sound/soc/intel/common/sst-acpi.c

View file