Merge branch 'maint'

diff --cc alsa_write.c
Simple merge

diff --cc blob.c
Simple merge

diff --cc fecdec_filter.c
Simple merge