Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 9 Jan 2018 07:49:41 +0000 (08:49 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 9 Jan 2018 07:49:53 +0000 (08:49 +0100)
commit9dd55cb419769f8cb363d764815f119b98a816fa
treeb423f3d594a2ac7d84b840b4ea11e24e86880155
parentda911b1f5e98f21b20aa042748dfe73e36322fb1
parent900498a34a3ac9c611e9b425094c8106bdd7dc1c
Merge branch 'for-linus' into for-next

Back-merge to continue fixing the OSS emulation code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/core/oss/pcm_oss.c
sound/core/pcm_lib.c