Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
  vlynq: make whole Kconfig-menu dependant on architecture
  add descriptive comment for TIF_MEMDIE task flag declaration.
  EEPROM: max6875: Header file cleanup
  EEPROM: 93cx6: Header file cleanup
  EEPROM: Header file cleanup
  agp: use NULL instead of 0 when pointer is needed
  rtc-v3020: make bitfield unsigned
  PCI: make bitfield unsigned
  jbd2: use NULL instead of 0 when pointer is needed
  cciss: fix shadows sparse warning
  doc: inode uses a mutex instead of a semaphore.
  uml: i386: Avoid redefinition of NR_syscalls
  fix "seperate" typos in comments
  cocbalt_lcdfb: correct sections
  doc: Change urls for sparse
  Powerpc: wii: Fix typo in comment
  i2o: cleanup some exit paths
  Documentation/: it's -> its where appropriate
  UML: Fix compiler warning due to missing task_struct declaration
  UML: add kernel.h include to signal.c
  ...

1 files changed, 2 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index de39882924d0..2f5510cc142d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2701,16 +2701,12 @@ F:	Documentation/timers/hpet.txt
 F:      drivers/char/hpet.c
 F:      include/linux/hpet.h
 
-HPET:   i386
-M:      "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com>
+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