Merge branch 'greybus' into staging-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Sep 2016 17:34:33 +0000 (19:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Sep 2016 17:34:33 +0000 (19:34 +0200)
commit530a70617cb6325bd7781e7a993d732d6d37915a
tree8226dccfa0931e33d15a6ac697b2eeb0a0ee67ff
parent26e9c85b48b4e3a2301c049213de3b5456c6b0a4
parent2bbadafbe4eacab57aa7bc8e50287c1366303807
Merge branch 'greybus' into staging-testing

This merges the greybus branch into staging-testing.  It contains the
drivers/staging/greybus/ subsystem and related drivers and has passed
the 0-day bot tests so no builds should break.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/Kconfig
drivers/staging/Makefile