Merge ath-next from ath.git

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

diff --git a/MAINTAINERS b/MAINTAINERS
index ddb9ac8d32b3eddc46d66bd408392ae09b637ea7..788d3a1fc7232cc606cdb7fdd7c7d38a8f228b71 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1657,7 +1657,6 @@ M:        Jiri Slaby <jirislaby@gmail.com>
 M:     Nick Kossifidis <mickflemm@gmail.com>
 M:     "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 L:     linux-wireless@vger.kernel.org
-L:     ath5k-devel@lists.ath5k.org
 W:     http://wireless.kernel.org/en/users/Drivers/ath5k
 S:     Maintained
 F:     drivers/net/wireless/ath/ath5k/
@@ -7008,11 +7007,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>