greybus: Merge branch 'master' into branch 'svc'.
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 12 Aug 2015 02:39:27 +0000 (19:39 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 12 Aug 2015 02:40:01 +0000 (19:40 -0700)
commit542f27a18f574d3807735bdcdbde8f8423c2f817
treedf2fe8cf1277826efa63fa2f2bf53f243e8d7b7f
parent067906f6906922ad784452218b09bfb2b9519643
parentbf81454738990e7acd089e1b8aac8bab6a54637f
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>
drivers/staging/greybus/connection.c
drivers/staging/greybus/greybus_protocols.h
drivers/staging/greybus/svc.c