diff --git a/[refs] b/[refs]
index c92170008b37..84ccd283bd80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8d89807373f95f3f7637e3987710a4500a7a857
+refs/heads/master: e07b5d795aebbd7445cc98e8cd86b2c05fab07f8
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 01d6a98cd5d2..d8391a4820cb 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2643,16 +2643,12 @@ F:	Documentation/timers/hpet.txt
 F:	drivers/char/hpet.c
 F:	include/linux/hpet.h
 
-HPET:	i386
+HPET:	x86
 M:	"Venkatesh Pallipadi (Venki)" <venki@google.com>
 S:	Maintained
 F:	arch/x86/kernel/hpet.c
 F:	arch/x86/include/asm/hpet.h
 
-HPET:	x86_64
-M:	Vojtech Pavlik <vojtech@suse.cz>
-S:	Maintained
-
 HPET:	ACPI
 M:	Bob Picco <bob.picco@hp.com>
 S:	Maintained