greybus: Merge branch 'master' into branch 'svc'.
authorGreg Kroah-Hartman <gregkh@google.com>
Wed, 12 Aug 2015 05:14:06 +0000 (22:14 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 12 Aug 2015 05:14:06 +0000 (22:14 -0700)
commitd706ef8f1b2add4abbbeacbbaaf0c304b25f4476
treebafc7e345469b4209ccaa0cd6c73a1d4dc04a8a0
parent542f27a18f574d3807735bdcdbde8f8423c2f817
parent58dab0f2a872be5dc2bdb15f3dc487b4a1b41aaf
greybus: Merge branch 'master' into branch 'svc'.

This drags in the firmware driver, and the start of some loopback
changes.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/Makefile
drivers/staging/greybus/connection.c
drivers/staging/greybus/core.c
drivers/staging/greybus/es1.c
drivers/staging/greybus/es2.c
drivers/staging/greybus/greybus.h
drivers/staging/greybus/greybus_protocols.h
drivers/staging/greybus/svc.c