From 0d1fec1ea58661f54144b80d5663ca3d0437db0e Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 9 Sep 2010 16:37:30 -0700
Subject: [PATCH] --- yaml --- r: 210443 b: refs/heads/master c:
 841a23ae1e7a8f8758ac915ceaf2e11a1cc235c5 h: refs/heads/master i:   210441:
 a17885e9d6beec9b82f22ae81df80da575a0cb34   210439:
 80816f3562071e6d4aa677dd9e25893bcdbca6e8 v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7b7b34113a57..61cc5ea2093e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6de860651d5a9e56ba4f4e3edc1aa52ac2ac849
+refs/heads/master: 841a23ae1e7a8f8758ac915ceaf2e11a1cc235c5
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 7e189b57c8b5..05e5537b7690 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2787,11 +2787,6 @@ S:	Maintained
 F:	arch/x86/kernel/hpet.c
 F:	arch/x86/include/asm/hpet.h
 
-HPET:	ACPI
-M:	Bob Picco <bob.picco@hp.com>
-S:	Maintained
-F:	drivers/char/hpet.c
-
 HPFS FILESYSTEM
 M:	Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
 W:	http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi