diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
| commit | a9802d43f205faa2fff422502a1336a50b9615c3 (patch) | |
| tree | 57152d6c84556320570802d01bbe04cefd8a2a7d /MAINTAINERS | |
| parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f540bb733ce..ed48d55662c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4914,8 +4914,6 @@ F: fs/ocfs2/ | |||
| 4914 | 4914 | ||
| 4915 | ORINOCO DRIVER | 4915 | ORINOCO DRIVER |
| 4916 | L: linux-wireless@vger.kernel.org | 4916 | L: linux-wireless@vger.kernel.org |
| 4917 | L: orinoco-users@lists.sourceforge.net | ||
| 4918 | L: orinoco-devel@lists.sourceforge.net | ||
| 4919 | W: http://linuxwireless.org/en/users/Drivers/orinoco | 4917 | W: http://linuxwireless.org/en/users/Drivers/orinoco |
| 4920 | W: http://www.nongnu.org/orinoco/ | 4918 | W: http://www.nongnu.org/orinoco/ |
| 4921 | S: Orphan | 4919 | S: Orphan |