Merge branch 'master' into next

diff --cc alsa_write.c
Simple merge

diff --cc file_write.c
Simple merge

diff --cc oss_write.c
Simple merge