diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /MAINTAINERS | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
| download | linux-stable-e300d955debdadf599c36e47eb0bc16f5976215c.tar.gz linux-stable-e300d955debdadf599c36e47eb0bc16f5976215c.tar.bz2 linux-stable-e300d955debdadf599c36e47eb0bc16f5976215c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2ebb56710f4d..bb6493bfe08a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -313,11 +313,9 @@ S: Maintained F: drivers/hwmon/adm1029.c ADM8211 WIRELESS DRIVER -M: Michael Wu <flamingice@sourmilk.net> L: linux-wireless@vger.kernel.org W: http://linuxwireless.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git -S: Maintained +S: Orphan F: drivers/net/wireless/adm8211.* ADT746X FAN DRIVER @@ -4251,10 +4249,9 @@ F: include/scsi/osd_* F: fs/exofs/ P54 WIRELESS DRIVER -M: Michael Wu <flamingice@sourmilk.net> +M: Christian Lamparter <chunkeey@googlemail.com> L: linux-wireless@vger.kernel.org -W: http://prism54.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git +W: http://wireless.kernel.org/en/users/Drivers/p54 S: Maintained F: drivers/net/wireless/p54/ |