greybus: Merge branch 'master' into branch 'svc'.

This required some hand-tweaking in connection.c, hopefully I got it all
correct...

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2015-08-11 19:39:27 -07:00
commit 542f27a18f
23 changed files with 99 additions and 268 deletions