diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 01:49:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 01:49:43 -0400 |
| commit | 4bc3e17cce5662092703b02ee7b030047b1c99b3 (patch) | |
| tree | 4f5edd94866a8a944518e1888034084de1bfd05e /MAINTAINERS | |
| parent | fee9dee730a40f671c1972a324ed54f0d68523e1 (diff) | |
| parent | ddd68587d0470498eb161de37b8f9fb5c48786a3 (diff) | |
Merge branch 'fixes-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f985dfa5941c..5b454627f211 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2449,13 +2449,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp | |||
| 2449 | S: Maintained | 2449 | S: Maintained |
| 2450 | 2450 | ||
| 2451 | MAC80211 | 2451 | MAC80211 |
| 2452 | P: Jiri Benc | ||
| 2453 | M: jbenc@suse.cz | ||
| 2454 | P: Michael Wu | 2452 | P: Michael Wu |
| 2455 | M: flamingice@sourmilk.net | 2453 | M: flamingice@sourmilk.net |
| 2454 | P: Johannes Berg | ||
| 2455 | M: johannes@sipsolutions.net | ||
| 2456 | P: Jiri Benc | ||
| 2457 | M: jbenc@suse.cz | ||
| 2456 | L: linux-wireless@vger.kernel.org | 2458 | L: linux-wireless@vger.kernel.org |
| 2457 | W: http://linuxwireless.org/ | 2459 | W: http://linuxwireless.org/ |
| 2458 | T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git | 2460 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git |
| 2459 | S: Maintained | 2461 | S: Maintained |
| 2460 | 2462 | ||
| 2461 | MACVLAN DRIVER | 2463 | MACVLAN DRIVER |