aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2004-08-05 19:13:12 -0400
committerJeff Garzik <jgarzik@pobox.com>2004-08-05 19:13:12 -0400
commit54d5ef53494929cee28a756e6cf9ec1e6ef1b19d (patch)
treeb89624c0664201cfb73f51464762e376b50065a2 /MAINTAINERS
parent30e74fea2a4c91f78fceed7d642535699baa1b67 (diff)
parentb11066186a87274ea9dcc79a735080b21e991b1e (diff)
downloadhistory-54d5ef53494929cee28a756e6cf9ec1e6ef1b19d.tar.gz
Merge bk://gkernel@bkbits.net/netdev-2.6
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 ddd2500496e8eb..af0eb6dcb5c92a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1586,6 +1586,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