diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-28 22:35:13 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-28 22:35:13 +0200 |
commit | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch) | |
tree | e912dbe14b6af76b0ebe853a9976c99616bb8a4c /MAINTAINERS | |
parent | Merge branch 'upstream-fixes' into upstream (diff) | |
parent | via-velocity: allow MTU size less than 1500 bytes (diff) | |
download | linux-b53471711f21ba0e151075f0e1d6d531eb50f1b1.tar.xz linux-b53471711f21ba0e151075f0e1d6d531eb50f1b1.zip |
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 31c23e3a2de9..8e88ff9c49ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -565,7 +565,7 @@ BROADBAND PROCESSOR ARCHITECTURE P: Arnd Bergmann M: arnd@arndb.de L: linuxppc-dev@ozlabs.org -W: http://linuxppc64.org +W: http://www.penguinppc.org/ppc64/ S: Supported BTTV VIDEO4LINUX DRIVER @@ -1722,7 +1722,7 @@ M: paulus@au.ibm.com P: Anton Blanchard M: anton@samba.org M: anton@au.ibm.com -W: http://linuxppc64.org +W: http://www.penguinppc.org/ppc64/ L: linuxppc-dev@ozlabs.org S: Supported |