diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /MAINTAINERS | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ce3c8f52c919..6d1b048c62a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -549,6 +549,7 @@ S: Maintained | |||
| 549 | COMMON INTERNET FILE SYSTEM (CIFS) | 549 | COMMON INTERNET FILE SYSTEM (CIFS) |
| 550 | P: Steve French | 550 | P: Steve French |
| 551 | M: sfrench@samba.org | 551 | M: sfrench@samba.org |
| 552 | L: linux-cifs-client@lists.samba.org | ||
| 552 | L: samba-technical@lists.samba.org | 553 | L: samba-technical@lists.samba.org |
| 553 | W: http://us1.samba.org/samba/Linux_CIFS_client.html | 554 | W: http://us1.samba.org/samba/Linux_CIFS_client.html |
| 554 | T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git | 555 | T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git |
| @@ -2059,7 +2060,7 @@ S: Maintained | |||
| 2059 | POSIX CLOCKS and TIMERS | 2060 | POSIX CLOCKS and TIMERS |
| 2060 | P: George Anzinger | 2061 | P: George Anzinger |
| 2061 | M: george@mvista.com | 2062 | M: george@mvista.com |
| 2062 | L: netdev@vger.kernel.org | 2063 | L: linux-kernel@vger.kernel.org |
| 2063 | S: Supported | 2064 | S: Supported |
| 2064 | 2065 | ||
| 2065 | POWERPC 4xx EMAC DRIVER | 2066 | POWERPC 4xx EMAC DRIVER |