From 20486e3a7a5feef017b611fc2e965fe721b8b3af Mon Sep 17 00:00:00 2001
From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Tue, 24 Jun 2008 03:34:40 +0000
Subject: [PATCH] sync

---
 Changes | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Changes b/Changes
index 5d9dcea31..00481492d 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,7 @@ been incorporated in changes in this release:
 
 Alain Portal <aportal@univ-montp2.fr>
 Andreas Herrmann <andreas.herrmann3@amd.comm>
+Andrew P <ap@zip.com.au>
 Andrew Clayton <andrew@digital-domain.net>
 Bart Van Assche <bart.vanassche@gmail.com>
 Christian Borntraeger <borntraeger@de.ib.com>
@@ -109,7 +110,8 @@ proc.5
         Document /proc/PID/status.
     mtk
         Add pointer to description of /proc/PID/cpuset in cpuset(7).
-    Samuel Thibault / mtk, review by Laurent Vivier and Christian Borntraeger
+    Samuel Thibault / mtk, review by Laurent Vivier,
+    		Christian Borntraeger, and Andrew P
         Document guest (virtual CPU) time field in /proc/stat.
         Document guest (virtual CPU) time fields in /proc/PID/stat.
 
@@ -279,6 +281,14 @@ getdents.2
         Document d_type field, present since kernel 2.6.4.
 	Other minor edits.
 
+getitimer.2
+    mtk
+        Noted that POSIX.1 leaves interactions with alarm(), sleep(),
+	and usleep() unspecified.
+        Linux 2.6.16 removed the MAX_SEC_IN_JIFFIES ceiling on timer
+	values.
+	Other minor changes.
+
 io_cancel.2
 io_destroy.2
 io_getevents.2