From c80835d7662cf7d63b412b7769626420ccb2077e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 23 Oct 2007 17:05:25 +0200 Subject: [PATCH] --- yaml --- r: 72597 b: refs/heads/master c: 31c7cecb616e499dd30703959710aebeee3f9af1 h: refs/heads/master i: 72595: e4e7ad2b09cbdf5c9887f8f5f908353566414d5a v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3d3d7d22d7c7..6a156a3f37ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48225709bec68c2d8612718922f974f22214a308 +refs/heads/master: 31c7cecb616e499dd30703959710aebeee3f9af1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 76b857157866..71badfbbf7ef 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2442,13 +2442,15 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp S: Maintained MAC80211 -P: Jiri Benc -M: jbenc@suse.cz P: Michael Wu M: flamingice@sourmilk.net +P: Johannes Berg +M: johannes@sipsolutions.net +P: Jiri Benc +M: jbenc@suse.cz L: linux-wireless@vger.kernel.org W: http://linuxwireless.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git +T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git S: Maintained MACVLAN DRIVER