aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--MAINTAINERS2
2 files changed, 1 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 7ef7b136e71d..d8f63e8329e8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -971,6 +971,7 @@ D: PowerPC
N: Daniel Drake
D: USBAT02 CompactFlash support in usb-storage
+D: ZD1211RW wireless driver
S: UK
N: Oleg Drokin
diff --git a/MAINTAINERS b/MAINTAINERS
index eeb4c70b3d5b..7dc658df9e00 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17800,7 +17800,6 @@ F: drivers/staging/nvec/
STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
M: Jens Frederich <[email protected]>
-M: Daniel Drake <[email protected]>
M: Jon Nettleton <[email protected]>
S: Maintained
W: http://wiki.laptop.org/go/DCON
@@ -20704,7 +20703,6 @@ S: Maintained
F: mm/zbud.c
ZD1211RW WIRELESS DRIVER
-M: Daniel Drake <[email protected]>
M: Ulrich Kunitz <[email protected]>
L: [email protected] (subscribers-only)