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

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 05a1f1a024ac9d0dbcf7bba6585b4f89ac589da8..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
@@ -2863,6 +2869,16 @@ M:       george@mvista.com
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 
+POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+P:     Anton Vorontsov
+M:     cbou@mail.ru
+P:     David Woodhouse
+M:     dwmw2@infradead.org
+L:     linux-kernel@vger.kernel.org
+L:     kernel-discuss@handhelds.org
+T:     git git.infradead.org/battery-2.6.git
+S:     Maintained
+
 POWERPC 4xx EMAC DRIVER
 P:     Eugene Surovegin
 M:     ebs@ebshome.net
@@ -3724,12 +3740,12 @@ L:      netdev@vger.kernel.org
 W:     http://pegasus2.sourceforge.net/
 S:     Maintained
 
-USB PRINTER DRIVER
-P:     Vojtech Pavlik
-M:     vojtech@suse.cz
+USB PRINTER DRIVER (usblp)
+P:     Pete Zaitcev
+M:     zaitcev@redhat.com
 L:     linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
-S:     Maintained
+S:     Supported
 
 USB RTL8150 DRIVER
 P:     Petko Manolov