Merge branch 'master' into next

* master:
  blob: Get rid of the two dummy event handlers.
  Check return value of lsu_com_help().
  afs.c: Improve documentation.

diff --cc afs.c
Simple merge

diff --cc audiod_command.c
Simple merge

diff --cc command.c
Simple merge

diff --cc play.c
Simple merge