Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[cascardo/linux.git] / MAINTAINERS
index b9d0293..8b0c4e2 100644 (file)
@@ -150,6 +150,14 @@ L: linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/53c700*
 
+6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
+M:     Alexander Aring <alex.aring@gmail.com>
+L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:     linux-bluetooth@vger.kernel.org
+S:     Maintained
+F:     net/6lowpan/
+F:     include/net/6lowpan.h
+
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <ajk@comnets.uni-bremen.de>
 L:     linux-hams@vger.kernel.org
@@ -1931,6 +1939,13 @@ S:       Supported
 F:     drivers/net/bonding/
 F:     include/uapi/linux/if_bonding.h
 
+BPF (Safe dynamic programs and tools)
+M:     Alexei Starovoitov <ast@kernel.org>
+L:     netdev@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     kernel/bpf/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Gary Zambrano <zambrano@broadcom.com>
 L:     netdev@vger.kernel.org
@@ -1944,7 +1959,8 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/genet/
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Michael Chan <mchan@broadcom.com>
+M:     Sony Chacko <sony.chacko@qlogic.com>
+M:     Dept-HSGLinuxNICDev@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
@@ -1989,7 +2005,7 @@ F:        arch/arm/boot/dts/bcm5301x.dtsi
 F:     arch/arm/boot/dts/bcm470*
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
-M:     Nithin Nayak Sujir <nsujir@broadcom.com>
+M:     Prashant Sreedharan <prashant@broadcom.com>
 M:     Michael Chan <mchan@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -2006,13 +2022,13 @@ S:      Supported
 F:     drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
-M:     Eddie Wai <eddie.wai@broadcom.com>
+M:     QLogic-Storage-Upstream@qlogic.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2fc/
 
 BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
-M:     Eddie Wai <eddie.wai@broadcom.com>
+M:     QLogic-Storage-Upstream@qlogic.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2i/
@@ -2540,8 +2556,8 @@ F:        arch/x86/kernel/cpuid.c
 F:     arch/x86/kernel/msr.c
 
 CPU POWER MONITORING SUBSYSTEM
-M:     Dominik Brodowski <linux@dominikbrodowski.net>
 M:     Thomas Renninger <trenn@suse.de>
+L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     tools/power/cpupower/
 
@@ -5408,6 +5424,7 @@ F:        arch/powerpc/boot/rs6000.h
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
 M:     Paul Mackerras <paulus@samba.org>
+M:     Michael Ellerman <mpe@ellerman.id.au>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
 Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@ -5449,16 +5466,17 @@ F:      arch/powerpc/*/*/*virtex*
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 M:     Vitaly Bordug <vitb@kernel.crashing.org>
-M:     Marcelo Tosatti <marcelo@kvack.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
+M:     Scott Wood <scottwood@freescale.com>
 M:     Kumar Gala <galak@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
 S:     Maintained
 F:     arch/powerpc/platforms/83xx/
 F:     arch/powerpc/platforms/85xx/
@@ -5681,16 +5699,6 @@ F:       Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
-MAC80211 PID RATE CONTROL
-M:     Stefano Brivio <stefano.brivio@polimi.it>
-M:     Mattias Nissler <mattias.nissler@gmx.de>
-L:     linux-wireless@vger.kernel.org
-W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
-S:     Maintained
-F:     net/mac80211/rc80211_pid*
-
 MACVLAN DRIVER
 M:     Patrick McHardy <kaber@trash.net>
 L:     netdev@vger.kernel.org
@@ -5735,7 +5743,8 @@ S:        Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:     Bing Zhao <bzhao@marvell.com>
+M:     Amitkumar Karwar <akarwar@marvell.com>
+M:     Avinash Patil <patila@marvell.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mwifiex/
@@ -6028,8 +6037,7 @@ F:        include/media/mt9v032.h
 MULTIFUNCTION DEVICES (MFD)
 M:     Samuel Ortiz <sameo@linux.intel.com>
 M:     Lee Jones <lee.jones@linaro.org>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:     Supported
 F:     drivers/mfd/
 F:     include/linux/mfd/
@@ -7059,8 +7067,10 @@ F:       include/linux/timer*
 F:     kernel/time/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+M:     Sebastian Reichel <sre@kernel.org>
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:     David Woodhouse <dwmw2@infradead.org>
+L:     linux-pm@vger.kernel.org
 T:     git git://git.infradead.org/battery-2.6.git
 S:     Maintained
 F:     include/linux/power_supply.h
@@ -7519,6 +7529,13 @@ F:       drivers/rtc/
 F:     include/linux/rtc.h
 F:     include/uapi/linux/rtc.h
 
+REALTEK AUDIO CODECS
+M:     Bard Liao <bardliao@realtek.com>
+M:     Oder Chiou <oder_chiou@realtek.com>
+S:     Maintained
+F:     sound/soc/codecs/rt*
+F:     include/sound/rt*.h
+
 REISERFS FILE SYSTEM
 L:     reiserfs-devel@vger.kernel.org
 S:     Supported
@@ -10048,6 +10065,13 @@ S:     Supported
 F:     arch/x86/pci/*xen*
 F:     drivers/pci/*xen*
 
+XEN BLOCK SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/block/xen-blkback/*
+F:     drivers/block/xen*
+
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)