diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 19:34:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 19:34:33 +0200 |
| commit | 530a70617cb6325bd7781e7a993d732d6d37915a (patch) | |
| tree | 8226dccfa0931e33d15a6ac697b2eeb0a0ee67ff /MAINTAINERS | |
| parent | 26e9c85b48b4e3a2301c049213de3b5456c6b0a4 (diff) | |
| parent | 2bbadafbe4eacab57aa7bc8e50287c1366303807 (diff) | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b654772cc2e..24b07f746919 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5290,6 +5290,23 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/aeroflex/ +GREYBUS SUBSYSTEM +M: Johan Hovold <johan@kernel.org> +M: Alex Elder <elder@kernel.org> +M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +S: Maintained +F: drivers/staging/greybus/ + +GREYBUS PROTOCOLS DRIVERS +M: Rui Miguel Silva <rmfrfs@gmail.com> +S: Maintained +F: drivers/staging/greybus/sdio.c +F: drivers/staging/greybus/light.c +F: drivers/staging/greybus/gpio.c +F: drivers/staging/greybus/power_supply.c +F: drivers/staging/greybus/spi.c +F: drivers/staging/greybus/spilib.c + GSPCA FINEPIX SUBDRIVER M: Frank Zago <frank@zago.net> L: linux-media@vger.kernel.org |