Greg Kroah-Hartman 7f69e5990f greybus: Merge branch 'master' into svc ...

Handle some merge conflicts in greybus_protocols.h due to changes on the
same structure in both branches.

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

2015-08-03 20:06:10 -07:00

drivers/staging/greybus

greybus: Merge branch 'master' into svc

2015-08-03 20:06:10 -07:00

Description

No description provided

7.9 GiB

Languages

C 97.7%

Assembly 1.6%

Makefile 0.3%

Perl 0.1%