aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2004-08-12 21:15:31 -0400
committerJeff Garzik <jgarzik@pobox.com>2004-08-12 21:15:31 -0400
commit803dc86ef422c1b8f81ef380b0ff0673b7b1b4de (patch)
tree79d12a2e6b9b3b9c295ee6892ba2dab71153da9d /MAINTAINERS
parent15aeed9352711084abde5f6b4cd4e0b29f5f83ba (diff)
parent54d5ef53494929cee28a756e6cf9ec1e6ef1b19d (diff)
downloadhistory-803dc86ef422c1b8f81ef380b0ff0673b7b1b4de.tar.gz
Merge pobox.com:/spare/repo/linux-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 c8c25df4347ba3..92ca7becc6802f 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