diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:21:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:21:02 -0400 |
| commit | 54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch) | |
| tree | 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /MAINTAINERS | |
| parent | 6d8de3a26b5c20b04a9317b4446582167d5883da (diff) | |
| parent | b71e318cdb1dc301d734fdd4983dfc6dc167235a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb389067cf66..eaa46594f021 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -116,6 +116,12 @@ M: ajk@iehk.rwth-aachen.de | |||
| 116 | L: linux-hams@vger.kernel.org | 116 | L: linux-hams@vger.kernel.org |
| 117 | S: Maintained | 117 | S: Maintained |
| 118 | 118 | ||
| 119 | YEALINK PHONE DRIVER | ||
| 120 | P: Henk Vergonet | ||
| 121 | M: Henk.Vergonet@gmail.com | ||
| 122 | L: usbb2k-api-dev@nongnu.org | ||
| 123 | S: Maintained | ||
| 124 | |||
| 119 | 8139CP 10/100 FAST ETHERNET DRIVER | 125 | 8139CP 10/100 FAST ETHERNET DRIVER |
| 120 | P: Jeff Garzik | 126 | P: Jeff Garzik |
| 121 | M: jgarzik@pobox.com | 127 | M: jgarzik@pobox.com |