team: don't call netdev_change_features under team->lock

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 33caa2b..8d39715 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7832,6 +7832,7 @@ Q:        http://patchwork.ozlabs.org/project/netdev/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
 S:     Odd Fixes
+F:     Documentation/devicetree/bindings/net/
 F:     drivers/net/
 F:     include/linux/if_*
 F:     include/linux/netdevice.h
@@ -11518,7 +11519,8 @@ F:      Documentation/filesystems/ubifs.txt
 F:     fs/ubifs/
 
 UCLINUX (M68KNOMMU AND COLDFIRE)
-M:     Greg Ungerer <gerg@uclinux.org>
+M:     Greg Ungerer <gerg@linux-m68k.org>
+W:     http://www.linux-m68k.org/
 W:     http://www.uclinux.org/
 L:     linux-m68k@lists.linux-m68k.org
 L:     uclinux-dev@uclinux.org  (subscribers-only)