sync

Changes

@@ -12,6 +12,8 @@ been incorporated in changes in this release:
 Alain PORTAL <alain.portal@free.fr>
 Andrew Morton <akpm@linux-foundation.org>
 David Brown <lkml@davidb.org>
+Jeremy Kerr <jk@ozlabs.org>
+Mats Wichmann <mats.d.wichmann@intel.com>
 Sam Morris <sam@robots.org.uk>
 Sam Varshavchik <mrsam@courier-mta.com>
 Samuel Thibault <samuel.thibault@ens-lyon.org>
@@ -72,6 +74,10 @@ select_tut.2
         Fix (my) typos in argument names.
 	Formatting fixes.
 
+spu_create.2
+    Jeremy Kerr
+        We can use context FDs for the dirfd argument to the *at() syscalls.
+
 times.2
     mtk, after a note from David Brown and Andrew Morton
         http://marc.info/?l=linux-kernel&m=119447727031225&w=2
@@ -85,6 +91,11 @@ times.2
 	Remove cruft HZ text.
 	Clarify text describing return value of clock(3).
 
+getw.3
+    Mats Wichmann
+        CONFORMING TO: getw() and putw() were in SUSv2, but are not
+	in POSIX.1-2001.
+
 hash.3
     mtk / Alain Portal
         Minor rewordings + formatting fixes.
@@ -115,3 +126,7 @@ man-pages.7
     mtk
         Note that code segments, structure definitions, shell session
 	logs, should be indented by 4 spaces.
+
+spufs.7
+    Jeremy Kerr
+        Add a little information about the differences to mbox.

Changes.old

@@ -9197,7 +9197,7 @@ gethostbyname.3
 
     Pádraig Brady / mtk / Ulrich Drepper
         Point out that the functions described on this page
-        are made obsolete by getadrinfo(3) and getnameinfo(3).
+        are made obsolete by getaddrinfo(3) and getnameinfo(3).
 
 getipnodebyname.3
     mtk
@@ -9221,7 +9221,7 @@ posix_fallocate.3
 
 rpc.3
     Sam Varshavchik
-        Add some arg declarations to prototypes; fixe typos.
+        Add some arg declarations to prototypes; fix typos.
 
 setbuf.3
     Mike Frysinger