projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da911b1 900498a)
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)
Back-merge to continue fixing the OSS emulation code.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
1  2 
sound/core/oss/pcm_oss.c patch | diff1 | diff2 | blob | history
sound/core/pcm_lib.c patch | diff1 | diff2 | blob | history

diff --cc sound/core/oss/pcm_oss.c
Simple merge
diff --cc sound/core/pcm_lib.c
Simple merge
Domain: System / Kernel;