tpm: drop tpm_atmel specific fields from tpm_vendor_specific

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3367e1e9d64a1f36f87c53b8e1e7ab34ccacec11..7227c791004fb912e9cd6d12a4130e019fd22763 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2813,7 +2813,7 @@ F:        include/uapi/linux/can/error.h
 F:     include/uapi/linux/can/netlink.h
 
 CAPABILITIES
-M:     Serge Hallyn <serge.hallyn@canonical.com>
+M:     Serge Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org
 S:     Supported
 F:     include/linux/capability.h
@@ -7989,6 +7989,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