Merge branch 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3036f5a02107385b07141c8ebe8e343182ec37cb..08a1378c70eddbab380cac98bce4588f13ae07e2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -823,12 +823,13 @@ F:        arch/arm/include/asm/floppy.h
 
 ARM PMU PROFILING AND DEBUGGING
 M:     Will Deacon <will.deacon@arm.com>
+R:     Mark Rutland <mark.rutland@arm.com>
 S:     Maintained
-F:     arch/arm/kernel/perf_*
+F:     arch/arm*/kernel/perf_*
 F:     arch/arm/oprofile/common.c
-F:     arch/arm/kernel/hw_breakpoint.c
-F:     arch/arm/include/asm/hw_breakpoint.h
-F:     arch/arm/include/asm/perf_event.h
+F:     arch/arm*/kernel/hw_breakpoint.c
+F:     arch/arm*/include/asm/hw_breakpoint.h
+F:     arch/arm*/include/asm/perf_event.h
 F:     drivers/perf/arm_pmu.c
 F:     include/linux/perf/arm_pmu.h
 
@@ -5439,7 +5440,8 @@ S:        Supported
 F:     drivers/idle/intel_idle.c
 
 INTEL PSTATE DRIVER
-M:     Kristen Carlson Accardi <kristen@linux.intel.com>
+M:     Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+M:     Len Brown <lenb@kernel.org>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/cpufreq/intel_pstate.c
@@ -5574,7 +5576,7 @@ F:        drivers/net/wireless/iwlegacy/
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Johannes Berg <johannes.berg@intel.com>
 M:     Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-M:     Intel Linux Wireless <ilw@linux.intel.com>
+M:     Intel Linux Wireless <linuxwifi@intel.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
@@ -6121,6 +6123,13 @@ F:       Documentation/auxdisplay/ks0108
 F:     drivers/auxdisplay/ks0108.c
 F:     include/linux/ks0108.h
 
+L3MDEV
+M:     David Ahern <dsa@cumulusnetworks.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     net/l3mdev
+F:     include/net/l3mdev.h
+
 LAPB module
 L:     linux-x25@vger.kernel.org
 S:     Orphan
@@ -7005,6 +7014,7 @@ M:        Alan Ott <alan@signal11.us>
 L:     linux-wpan@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ieee802154/mrf24j40.c
+F:     Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
 
 MSI LAPTOP SUPPORT
 M:     "Lee, Chun-Yi" <jlee@suse.com>
@@ -7339,7 +7349,6 @@ S:        Odd Fixes
 F:     drivers/net/
 F:     include/linux/if_*
 F:     include/linux/netdevice.h
-F:     include/linux/arcdevice.h
 F:     include/linux/etherdevice.h
 F:     include/linux/fcdevice.h
 F:     include/linux/fddidevice.h
@@ -8560,6 +8569,16 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlge/
 
+QLOGIC QL4xxx ETHERNET DRIVER
+M:     Yuval Mintz <Yuval.Mintz@qlogic.com>
+M:     Ariel Elior <Ariel.Elior@qlogic.com>
+M:     everest-linux-l2@qlogic.com
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/qlogic/qed/
+F:     include/linux/qed/
+F:     drivers/net/ethernet/qlogic/qede/
+
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
 W:     http://www.alarsen.net/linux/qnx4fs/
@@ -8911,6 +8930,13 @@ S:       Maintained
 F:     drivers/net/wireless/rtlwifi/
 F:     drivers/net/wireless/rtlwifi/rtl8192ce/
 
+RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
+M:     Jes Sorensen <Jes.Sorensen@redhat.com>
+L:     linux-wireless@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8723au-mac80211
+S:     Maintained
+F:     drivers/net/wireless/realtek/rtl8xxxu/
+
 S3 SAVAGE FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
@@ -11315,7 +11341,6 @@ M:      Shrijeet Mukherjee <shm@cumulusnetworks.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/vrf.c
-F:     include/net/vrf.h
 F:     Documentation/networking/vrf.txt
 
 VT1211 HARDWARE MONITOR DRIVER