MAINTAINERS: Update Open vSwitch entry.

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7605833..3309895 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2576,8 +2576,9 @@ F:        drivers/media/platform/coda/
 
 COMMON CLK FRAMEWORK
 M:     Mike Turquette <mturquette@linaro.org>
+M:     Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-kernel@vger.kernel.org
-T:     git git://git.linaro.org/people/mturquette/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:     Maintained
 F:     drivers/clk/
 X:     drivers/clk/clkdev.c
@@ -4963,6 +4964,12 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
 S:     Supported
 F:     drivers/idle/intel_idle.c
 
+INTEL PSTATE DRIVER
+M:     Kristen Carlson Accardi <kristen@linux.intel.com>
+L:     linux-pm@vger.kernel.org
+S:     Supported
+F:     drivers/cpufreq/intel_pstate.c
+
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 M:     Maik Broemme <mbroemme@plusserver.de>
 L:     linux-fbdev@vger.kernel.org
@@ -6610,19 +6617,8 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 
 NETWORKING [WIRELESS]
-M:     "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-wireless/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
-S:     Maintained
-F:     net/mac80211/
-F:     net/rfkill/
-F:     net/wireless/
-F:     include/net/ieee80211*
-F:     include/linux/wireless.h
-F:     include/uapi/linux/wireless.h
-F:     include/net/iw_handler.h
-F:     drivers/net/wireless/
 
 NETWORKING DRIVERS
 L:     netdev@vger.kernel.org
@@ -6643,6 +6639,14 @@ F:       include/linux/inetdevice.h
 F:     include/uapi/linux/if_*
 F:     include/uapi/linux/netdevice.h
 
+NETWORKING DRIVERS (WIRELESS)
+M:     Kalle Valo <kvalo@codeaurora.org>
+L:     linux-wireless@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-wireless/list/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
+S:     Maintained
+F:     drivers/net/wireless/
+
 NETXEN (1/10) GbE SUPPORT
 M:     Manish Chopra <manish.chopra@qlogic.com>
 M:     Sony Chacko <sony.chacko@qlogic.com>
@@ -7004,11 +7008,12 @@ F:      arch/openrisc/
 
 OPENVSWITCH
 M:     Pravin Shelar <pshelar@nicira.com>
+L:     netdev@vger.kernel.org
 L:     dev@openvswitch.org
 W:     http://openvswitch.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
 S:     Maintained
 F:     net/openvswitch/
+F:     include/uapi/linux/openvswitch.h
 
 OPL4 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
@@ -10240,13 +10245,13 @@ L:    netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/via/via-velocity.*
 
-VIVI VIRTUAL VIDEO DRIVER
+VIVID VIRTUAL VIDEO DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
 W:     http://linuxtv.org
 S:     Maintained
-F:     drivers/media/platform/vivi*
+F:     drivers/media/platform/vivid/*
 
 VLAN (802.1Q)
 M:     Patrick McHardy <kaber@trash.net>