diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 15:06:58 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 15:06:58 -0400 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /MAINTAINERS | |
| parent | 8344b568f5bdc7ee1bba909de3294c6348c36056 (diff) | |
| parent | 0e6859d49ff194e01afc229c996e3aefca1a0539 (diff) | |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 89db949bcd80..02a85ab7387d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3658,13 +3658,6 @@ M: romieu@fr.zoreil.com | |||
| 3658 | L: netdev@vger.kernel.org | 3658 | L: netdev@vger.kernel.org |
| 3659 | S: Maintained | 3659 | S: Maintained |
| 3660 | 3660 | ||
| 3661 | SIS 5513 IDE CONTROLLER DRIVER | ||
| 3662 | P: Lionel Bouton | ||
| 3663 | M: Lionel.Bouton@inet6.fr | ||
| 3664 | W: http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html | ||
| 3665 | W: http://gyver.homeip.net/sis5513/index.html | ||
| 3666 | S: Maintained | ||
| 3667 | |||
| 3668 | SIS 900/7016 FAST ETHERNET DRIVER | 3661 | SIS 900/7016 FAST ETHERNET DRIVER |
| 3669 | P: Daniele Venzano | 3662 | P: Daniele Venzano |
| 3670 | M: venza@brownhat.org | 3663 | M: venza@brownhat.org |