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 /drivers/staging/Kconfig | |
| parent | staging: lustre: update version to 2.6.99 (diff) | |
| parent | staging: greybus: MAINTAINERS: add greybus protocol drivers maintainers (diff) | |
| download | linux-dev-530a70617cb6325bd7781e7a993d732d6d37915a.tar.xz linux-dev-530a70617cb6325bd7781e7a993d732d6d37915a.zip | |
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 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 5ebaf0028a10..9c0339c53fe0 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -102,4 +102,6 @@ source "drivers/staging/i4l/Kconfig" source "drivers/staging/ks7010/Kconfig" +source "drivers/staging/greybus/Kconfig" + endif # STAGING |