aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2004-07-29 04:21:59 -0400
committerJeff Garzik <jgarzik@pobox.com>2004-07-29 04:21:59 -0400
commitedf609bc8cd4a3bb02af4d28e9faee6e110a28a1 (patch)
tree6b8dbb3b65616a26e2297b312dca0161fed6b3ef /MAINTAINERS
parent5b6f06d7563700962118e241ecb0041955ddc029 (diff)
parentd9c092a1ed762ae2ad1091f290b5bda2a0865ba1 (diff)
downloadhistory-edf609bc8cd4a3bb02af4d28e9faee6e110a28a1.tar.gz
Merge pobox.com:/spare/repo/netdev-2.6/e100-2
into pobox.com:/spare/repo/netdev-2.6/ALL
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 842b276398417a..286d12434a823f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1579,6 +1579,8 @@ L: oprofile-list@lists.sf.net
S: Maintained
ORINOCO DRIVER
+P: Pavel Roskin
+M: proski@gnu.org
P: David Gibson
M: hermes@gibson.dropbear.id.au
W: http://www.ozlabs.org/people/dgibson/dldwd