Merge git://git.infradead.org/battery-2.6

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f57f6e031c29e328a02d7ee77a3903eec98c5321..391426977826a00047429f243eadc9aab0c0a4ce 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2330,6 +2330,12 @@ W:       http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
 S:     Maintained
 
+MACVLAN DRIVER
+P:     Patrick McHardy
+M:     kaber@trash.net
+L:     netdev@vger.kernel.org
+S:     Maintained
+
 MARVELL YUKON / SYSKONNECT DRIVER
 P:     Mirko Lindner
 M:     mlindner@syskonnect.de