diff --git a/[refs] b/[refs]
index 5330ef6cd042..638cb4458f85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b15194b7076d6bb7b0b6f3efcb6a103e6cbcc5db
+refs/heads/master: 04a6553f0766df3f56830c89b7da2f618b7ef0b0
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 42471b830967..8aa1cacddbcc 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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