aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a7b0b36e8b4..0ea3a6d98714 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -911,7 +911,7 @@ S: Maintained
911BLACKFIN ARCHITECTURE 911BLACKFIN ARCHITECTURE
912P: Bryan Wu 912P: Bryan Wu
913M: cooloney@kernel.org 913M: cooloney@kernel.org
914L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) 914L: uclinux-dist-devel@blackfin.uclinux.org
915W: http://blackfin.uclinux.org 915W: http://blackfin.uclinux.org
916S: Supported 916S: Supported
917 917
@@ -2220,7 +2220,7 @@ P: Sean Hefty
2220M: sean.hefty@intel.com 2220M: sean.hefty@intel.com
2221P: Hal Rosenstock 2221P: Hal Rosenstock
2222M: hal.rosenstock@gmail.com 2222M: hal.rosenstock@gmail.com
2223L: general@lists.openfabrics.org 2223L: general@lists.openfabrics.org (moderated for non-subscribers)
2224W: http://www.openib.org/ 2224W: http://www.openib.org/
2225T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git 2225T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
2226S: Supported 2226S: Supported
@@ -2844,8 +2844,6 @@ S: Maintained
2844MAC80211 2844MAC80211
2845P: Johannes Berg 2845P: Johannes Berg
2846M: johannes@sipsolutions.net 2846M: johannes@sipsolutions.net
2847P: Michael Wu
2848M: flamingice@sourmilk.net
2849L: linux-wireless@vger.kernel.org 2847L: linux-wireless@vger.kernel.org
2850W: http://linuxwireless.org/ 2848W: http://linuxwireless.org/
2851T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git 2849T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -4851,6 +4849,7 @@ P: Ingo Molnar
4851M: mingo@redhat.com 4849M: mingo@redhat.com
4852P: H. Peter Anvin 4850P: H. Peter Anvin
4853M: hpa@zytor.com 4851M: hpa@zytor.com
4852M: x86@kernel.org
4854L: linux-kernel@vger.kernel.org 4853L: linux-kernel@vger.kernel.org
4855T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git 4854T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
4856S: Maintained 4855S: Maintained