Merge branch 'for-linus' into for-next

Browse source

Back-merge to continue fixing the OSS emulation code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

...

This commit is contained in:

Takashi Iwai 2018-01-09 08:49:41 +01:00

parent da911b1f5e 900498a34a

commit 9dd55cb419

5 changed files with 97 additions and 69 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

41

sound/core/oss/pcm_oss.c

View file

14

sound/core/oss/pcm_plugin.c

View file

4

sound/core/pcm_lib.c

View file

9

sound/core/pcm_native.c

View file

98

sound/drivers/aloop.c

View file