From a6e951a362ccdfb62bcf3015d9df5671d6ac9a60 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 15 Jan 2006 02:09:54 +0100
Subject: [PATCH] --- yaml --- r: 18587 b: refs/heads/master c:
 fad6a94ee6b33ca5e6184e8b08634a6a2319d0cb h: refs/heads/master i:   18585:
 3ce5de03e59cfcd37aec455f140df012f6be557e   18583:
 cff4e2bf43e8f76db610b583e8b79c1e9d84aa32 v: v3

---
 [refs]                       | 2 +-
 trunk/Documentation/hpet.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e972fc87811c..5f75a30ee7e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 750c902ef4a1956cecbc8fb590ce2dad5b02eab9
+refs/heads/master: fad6a94ee6b33ca5e6184e8b08634a6a2319d0cb
diff --git a/trunk/Documentation/hpet.txt b/trunk/Documentation/hpet.txt
index e52457581f47..b7a3dc38dd52 100644
--- a/trunk/Documentation/hpet.txt
+++ b/trunk/Documentation/hpet.txt
@@ -2,7 +2,7 @@
 
 The High Precision Event Timer (HPET) hardware is the future replacement
 for the 8254 and Real Time Clock (RTC) periodic timer functionality.
-Each HPET can have up two 32 timers.  It is possible to configure the
+Each HPET can have up to 32 timers.  It is possible to configure the
 first two timers as legacy replacements for 8254 and RTC periodic timers.
 A specification done by Intel and Microsoft can be found at
 <http://www.intel.com/hardwaredesign/hpetspec.htm>.