diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 02:09:14 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 02:09:14 +0200 |
| commit | b0df3bd1e553e901ec7297267611a5db88240b38 (patch) | |
| tree | 3eceef36f96a6cf187cf8c4072fd83b4f6435315 /MAINTAINERS | |
| parent | [PATCH] more s2io __iomem annotations (diff) | |
| parent | [PATCH] bcm43xx: fix netdev watchdog timeouts (diff) | |
| download | linux-b0df3bd1e553e901ec7297267611a5db88240b38.tar.xz linux-b0df3bd1e553e901ec7297267611a5db88240b38.zip | |
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 P: Daniel Drake M: dsd@gentoo.org W: http://softmac.sipsolutions.net/ -L: softmac-dev@sipsolutions.net L: netdev@vger.kernel.org S: Maintained |