staging: ozwpan: Remove from tree

Ozwpan is completely unmaintained and potentially a security problem. As
this is a staging driver, it should be removed, since it has been
abandoned.

Cc: Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5ac00cb..fb7d3b6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9734,11 +9734,6 @@ W:       http://wiki.laptop.org/go/DCON
 S:     Maintained
 F:     drivers/staging/olpc_dcon/
 
-STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:     Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
-S:     Maintained
-F:     drivers/staging/ozwpan/
-
 STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 M:     Willy Tarreau <willy@meta-x.org>
 S:     Odd Fixes

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/ozwpan/Kconfig
Simple merge

diff --cc drivers/staging/ozwpan/Makefile
Simple merge

diff --cc drivers/staging/ozwpan/README
Simple merge

diff --cc drivers/staging/ozwpan/TODO
Simple merge

diff --cc drivers/staging/ozwpan/ozappif.h
Simple merge

diff --cc drivers/staging/ozwpan/ozcdev.c
Simple merge

diff --cc drivers/staging/ozwpan/ozcdev.h
Simple merge

diff --cc drivers/staging/ozwpan/ozdbg.h
Simple merge

diff --cc drivers/staging/ozwpan/ozeltbuf.c
Simple merge

diff --cc drivers/staging/ozwpan/ozeltbuf.h
Simple merge

diff --cc drivers/staging/ozwpan/ozhcd.c
Simple merge

diff --cc drivers/staging/ozwpan/ozhcd.h
Simple merge

diff --cc drivers/staging/ozwpan/ozmain.c
Simple merge

diff --cc drivers/staging/ozwpan/ozpd.c
Simple merge

diff --cc drivers/staging/ozwpan/ozpd.h
Simple merge

diff --cc drivers/staging/ozwpan/ozproto.c
Simple merge

diff --cc drivers/staging/ozwpan/ozproto.h
Simple merge

diff --cc drivers/staging/ozwpan/ozprotocol.h
Simple merge

diff --cc drivers/staging/ozwpan/ozurbparanoia.c
Simple merge

diff --cc drivers/staging/ozwpan/ozurbparanoia.h
Simple merge

diff --cc drivers/staging/ozwpan/ozusbif.h
Simple merge

diff --cc drivers/staging/ozwpan/ozusbsvc.c
Simple merge

diff --cc drivers/staging/ozwpan/ozusbsvc.h
Simple merge

diff --cc drivers/staging/ozwpan/ozusbsvc1.c
Simple merge