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)
commitbc334cb61b9ee6e85b9bb01519989a3ae8fe03f6
tree34424a812537fe11beeee727b30b19c67193fe36
parent5607dddbfca774fb38bffadcb077fe03aa4ac5c6
parentb44d419b98fae759b4f746186b1d1c8d01d962f2
Merge branch 'for-next' into for-linus

Preparation for 4.17 merge.

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