diff options
| author | Greg Kroah-Hartman | 2014-04-22 19:08:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-04-22 19:08:40 +0200 |
| commit | 3eb9992caff10b62cf0ed0bcb1667a58b13188fa (patch) | |
| tree | abe4b4b586978773e2df21898eda611bc6eb822c /drivers/staging/Kconfig | |
| parent | Staging:bcm: Fixes coding style issues in drivers/staging/bcm/Qos.c (diff) | |
| parent | Linux 3.15-rc2 (diff) | |
| download | kernel-qcow2-linux-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.tar.gz kernel-qcow2-linux-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.tar.xz kernel-qcow2-linux-3eb9992caff10b62cf0ed0bcb1667a58b13188fa.zip | |
Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.
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 b597165092f8..e62be2b0b16d 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -40,8 +40,6 @@ source "drivers/staging/olpc_dcon/Kconfig" source "drivers/staging/panel/Kconfig" -source "drivers/staging/rtl8187se/Kconfig" - source "drivers/staging/rtl8192u/Kconfig" source "drivers/staging/rtl8192e/Kconfig" |