summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-03-28 14:40:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-28 14:40:06 -0400
commit630a216da662ba4197e330118fc55d772a2d7ec9 (patch)
treeddadafda9ba834e74e7f882d761900e08bb1ca1c /MAINTAINERS
parent91c5746425aed8f7188a351f1224a26aa232e4b3 (diff)
parent2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff)
downloadlinux-630a216da662ba4197e330118fc55d772a2d7ec9.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 72b08438d536..457ff5c52396 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5059,9 +5059,8 @@ S: Maintained
F: drivers/net/ethernet/marvell/sk*
MARVELL LIBERTAS WIRELESS DRIVER
-M: Dan Williams <dcbw@redhat.com>
L: libertas-dev@lists.infradead.org
-S: Maintained
+S: Orphan
F: drivers/net/wireless/libertas/
MARVELL MV643XX ETHERNET DRIVER