diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
| commit | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch) | |
| tree | e912dbe14b6af76b0ebe853a9976c99616bb8a4c /MAINTAINERS | |
| parent | 983f27d37d4fc72c252835cb2ee3103b360735a6 (diff) | |
| parent | 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff) | |
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 | |||
| 565 | P: Arnd Bergmann | 565 | P: Arnd Bergmann |
| 566 | M: arnd@arndb.de | 566 | M: arnd@arndb.de |
| 567 | L: linuxppc-dev@ozlabs.org | 567 | L: linuxppc-dev@ozlabs.org |
| 568 | W: http://linuxppc64.org | 568 | W: http://www.penguinppc.org/ppc64/ |
| 569 | S: Supported | 569 | S: Supported |
| 570 | 570 | ||
| 571 | BTTV VIDEO4LINUX DRIVER | 571 | BTTV VIDEO4LINUX DRIVER |
| @@ -1722,7 +1722,7 @@ M: paulus@au.ibm.com | |||
| 1722 | P: Anton Blanchard | 1722 | P: Anton Blanchard |
| 1723 | M: anton@samba.org | 1723 | M: anton@samba.org |
| 1724 | M: anton@au.ibm.com | 1724 | M: anton@au.ibm.com |
| 1725 | W: http://linuxppc64.org | 1725 | W: http://www.penguinppc.org/ppc64/ |
| 1726 | L: linuxppc-dev@ozlabs.org | 1726 | L: linuxppc-dev@ozlabs.org |
| 1727 | S: Supported | 1727 | S: Supported |
| 1728 | 1728 | ||