diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-27 12:40:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-27 12:40:40 -0400 |
| commit | 371858568e02698fe2de8ba4bf771e3f40db69e5 (patch) | |
| tree | 07ec799d7babae7eafda93d9dfd9d11fccff086f /MAINTAINERS | |
| parent | e82b0f2cc21be905e504573483fa9542b15df96f (diff) | |
| parent | 54f4ee183aea859eb09f141dad3fc3c6f4fe0446 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[PATCH] powerpc: fix RTC/NVRAM accesses on Maple
[PATCH] ppc32 CPM_UART: various fixes for pq2 uart users
[PATCH] powerpc: linuxppc64.org no more
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 92d696874965..74d71cafb17c 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 |
| @@ -1716,7 +1716,7 @@ M: paulus@au.ibm.com | |||
| 1716 | P: Anton Blanchard | 1716 | P: Anton Blanchard |
| 1717 | M: anton@samba.org | 1717 | M: anton@samba.org |
| 1718 | M: anton@au.ibm.com | 1718 | M: anton@au.ibm.com |
| 1719 | W: http://linuxppc64.org | 1719 | W: http://www.penguinppc.org/ppc64/ |
| 1720 | L: linuxppc-dev@ozlabs.org | 1720 | L: linuxppc-dev@ozlabs.org |
| 1721 | S: Supported | 1721 | S: Supported |
| 1722 | 1722 | ||