diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
| commit | e9723bf2ad1b7384e8d475e5356f51a1f35a8934 (patch) | |
| tree | d9e6008e3bc147391634299dfb0f010591d52063 /drivers/staging/Kconfig | |
| parent | 79f284d29bbf7852093d0262c097e8faee32bc03 (diff) | |
| parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) | |
Merge 3.17-rc3 into staging-next
We want the staging bugfixes in this branch as well.
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, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 7b50a90fbb4b..6e2d6fd85b89 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -28,8 +28,6 @@ source "drivers/staging/et131x/Kconfig" source "drivers/staging/slicoss/Kconfig" -source "drivers/staging/usbip/Kconfig" - source "drivers/staging/wlan-ng/Kconfig" source "drivers/staging/comedi/Kconfig" |