greybus: Merge branch 'master' into svc

Browse source

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>

...

This commit is contained in:

Greg Kroah-Hartman 2015-08-03 20:06:10 -07:00

parent b86b64e9a7 5b559e6457

commit 7f69e5990f

2 changed files with 45 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

61

drivers/staging/greybus/greybus_protocols.h

View file

29

drivers/staging/greybus/operation.h

View file