X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=MAINTAINERS;h=8aa1cacddbcc250bbf87c4759a977e419ffc33d8;hb=15b7cf1416c0e3ae6163ade3349d717fe2729952;hp=4fb9017b441330a997f5a0d9499a3f1d245f3524;hpb=16c29dafcc86024048f1dbb8349d31cb22c7c55a;p=firefly-linux-kernel-4.4.55.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 4fb9017b4413..8aa1cacddbcc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -548,10 +548,8 @@ S:	Maintained
 F:	sound/aoa/
 
 APM DRIVER
-M:	Stephen Rothwell <sfr@canb.auug.org.au>
 L:	linux-laptop@vger.kernel.org
-W:	http://www.canb.auug.org.au/~sfr/
-S:	Supported
+S:	Orphan
 F:	arch/x86/kernel/apm_32.c
 F:	include/linux/apm_bios.h
 
@@ -6633,6 +6631,7 @@ F:	drivers/media/video/zr364xx.c
 
 USER-MODE LINUX (UML)
 M:	Jeff Dike <jdike@addtoit.com>
+M:	Richard Weinberger <richard@nod.at>
 L:	user-mode-linux-devel@lists.sourceforge.net
 L:	user-mode-linux-user@lists.sourceforge.net
 W:	http://user-mode-linux.sourceforge.net