greybus: Merge branch alex into Alexandre

Browse source

This resolves a conflict with es2.c that I fixed up.

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

...

This commit is contained in:

Greg Kroah-Hartman 2015-06-15 16:53:23 -07:00

parent fc1a536e60 4bc1389de9

commit 9df94499c4

6 changed files with 115 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

2

drivers/staging/greybus/connection.c

View file

12

drivers/staging/greybus/core.c

View file

63

drivers/staging/greybus/es1.c

View file

63

drivers/staging/greybus/es2.c

View file

15

drivers/staging/greybus/greybus.h

View file

5

drivers/staging/greybus/manifest.c

View file