diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:09:14 -0400 |
| commit | b0df3bd1e553e901ec7297267611a5db88240b38 (patch) | |
| tree | 3eceef36f96a6cf187cf8c4072fd83b4f6435315 /MAINTAINERS | |
| parent | cc3afe6f856054a3752ef2b3ccc5eebf33bd5024 (diff) | |
| parent | a67ab2bde752b26be75d4b68ecead9a14692eac5 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 16af51ba44a5..bd446e251d5b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2655,7 +2655,6 @@ M: josejx@gentoo.org | |||
| 2655 | P: Daniel Drake | 2655 | P: Daniel Drake |
| 2656 | M: dsd@gentoo.org | 2656 | M: dsd@gentoo.org |
| 2657 | W: http://softmac.sipsolutions.net/ | 2657 | W: http://softmac.sipsolutions.net/ |
| 2658 | L: softmac-dev@sipsolutions.net | ||
| 2659 | L: netdev@vger.kernel.org | 2658 | L: netdev@vger.kernel.org |
| 2660 | S: Maintained | 2659 | S: Maintained |
| 2661 | 2660 | ||