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

Browse source

...

This commit is contained in:

Mark Brown 2017-02-19 16:36:32 +00:00

parent 96f0e8a5b0 bfe48dffc8 1c445a42c4

commit 64c37d50ad

2 changed files with 1 additions and 3 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

2

sound/soc/codecs/max98090.c

View file

2

sound/soc/img/img-parallel-out.c

View file