diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-01 15:01:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-01 15:01:05 -0400 |
| commit | a3f86ec002774f28b9b3d1d5e5532231e96a0861 (patch) | |
| tree | 740ea059803c6e377e930b19bc8e37134e2b5051 /MAINTAINERS | |
| parent | b963ea89f00f13c648af4082e5efb2172d369727 (diff) | |
| parent | 904879748d7439a6dabdc6be9aad983e216b027d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 44620aebb369..8e85429d3bb0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4549,7 +4549,7 @@ F: include/linux/preempt.h | |||
| 4549 | PRISM54 WIRELESS DRIVER | 4549 | PRISM54 WIRELESS DRIVER |
| 4550 | M: "Luis R. Rodriguez" <mcgrof@gmail.com> | 4550 | M: "Luis R. Rodriguez" <mcgrof@gmail.com> |
| 4551 | L: linux-wireless@vger.kernel.org | 4551 | L: linux-wireless@vger.kernel.org |
| 4552 | W: http://prism54.org | 4552 | W: http://wireless.kernel.org/en/users/Drivers/p54 |
| 4553 | S: Obsolete | 4553 | S: Obsolete |
| 4554 | F: drivers/net/wireless/prism54/ | 4554 | F: drivers/net/wireless/prism54/ |
| 4555 | 4555 | ||