aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS13
1 files changed, 8 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 01605a9b95e7..cd587eec9fa7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -995,8 +995,8 @@ L: netdev@vger.kernel.org
995S: Supported 995S: Supported
996 996
997BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER 997BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
998P: Eliezer Tamir 998P: Eilon Greenstein
999M: eliezert@broadcom.com 999M: eilong@broadcom.com
1000L: netdev@vger.kernel.org 1000L: netdev@vger.kernel.org
1001S: Supported 1001S: Supported
1002 1002
@@ -1202,6 +1202,7 @@ M: pj@sgi.com
1202M: menage@google.com 1202M: menage@google.com
1203L: linux-kernel@vger.kernel.org 1203L: linux-kernel@vger.kernel.org
1204W: http://www.bullopensource.org/cpuset/ 1204W: http://www.bullopensource.org/cpuset/
1205W: http://oss.sgi.com/projects/cpusets/
1205S: Supported 1206S: Supported
1206 1207
1207CRAMFS FILESYSTEM 1208CRAMFS FILESYSTEM
@@ -3329,9 +3330,11 @@ L: video4linux-list@redhat.com
3329W: http://www.isely.net/pvrusb2/ 3330W: http://www.isely.net/pvrusb2/
3330S: Maintained 3331S: Maintained
3331 3332
3332PXA2xx SUPPORT 3333PXA2xx/PXA3xx SUPPORT
3333P: Nicolas Pitre 3334P: Eric Miao
3334M: nico@cam.org 3335M: eric.miao@marvell.com
3336P: Russell King
3337M: linux@arm.linux.org.uk
3335L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 3338L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
3336S: Maintained 3339S: Maintained
3337 3340