projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5607ddd b44d419)
Merge branch 'for-next' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 2 Apr 2018 17:50:41 +0000 (19:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 2 Apr 2018 17:50:59 +0000 (19:50 +0200)
Preparation for 4.17 merge.

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

diff --cc sound/core/oss/pcm_oss.c
Simple merge
diff --cc sound/core/pcm_native.c
Simple merge
John Crispins staging tree