diff --git a/[refs] b/[refs] index 46b43b465fb8..f30b70049e25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a46f025d053e47b9ce602f53f6d30e94d304a51c +refs/heads/master: 0f48d7e1cf2341148dcafc19a098ca22e184bee9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 45b86ab45d51..36aadf6003b9 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2547,12 +2547,10 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp S: Maintained MAC80211 -P: Michael Wu -M: flamingice@sourmilk.net P: Johannes Berg M: johannes@sipsolutions.net -P: Jiri Benc -M: jbenc@suse.cz +P: Michael Wu +M: flamingice@sourmilk.net L: linux-wireless@vger.kernel.org W: http://linuxwireless.org/ T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git