diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 14:16:30 -0400 |
| commit | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (patch) | |
| tree | 09933113cf28f253db1dd539463bdab741d67139 /MAINTAINERS | |
| parent | 62c592edead3c3a045662595f7ade3c12f133373 (diff) | |
| parent | ed735ccbefaf7e5e3ef61418f7e209b8c59308a7 (diff) | |
Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 564a03e61a0c..e8214fe53a5e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2092,6 +2092,12 @@ M: support@simtec.co.uk | |||
| 2092 | W: http://www.simtec.co.uk/products/EB2410ITX/ | 2092 | W: http://www.simtec.co.uk/products/EB2410ITX/ |
| 2093 | S: Supported | 2093 | S: Supported |
| 2094 | 2094 | ||
| 2095 | SIS 190 ETHERNET DRIVER | ||
| 2096 | P: Francois Romieu | ||
| 2097 | M: romieu@fr.zoreil.com | ||
| 2098 | L: netdev@vger.kernel.org | ||
| 2099 | S: Maintained | ||
| 2100 | |||
| 2095 | SIS 5513 IDE CONTROLLER DRIVER | 2101 | SIS 5513 IDE CONTROLLER DRIVER |
| 2096 | P: Lionel Bouton | 2102 | P: Lionel Bouton |
| 2097 | M: Lionel.Bouton@inet6.fr | 2103 | M: Lionel.Bouton@inet6.fr |