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