greybus: Merge branch 'master' into svc to keep it up to date.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --cc drivers/staging/greybus/connection.c
Simple merge