---

yaml
---
r: 62167
b: refs/heads/master
c: 4994cd8
h: refs/heads/master
i:
  62165: dcfde00
  62163: 14ab804
  62159: 58af992
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c6b065b792061c2e471d530127f2348fd9d243d
+refs/heads/master: 4994cd8dadcf9d484ab3ec19f3c7c7a4e5353c1c

trunk/CREDITS

@@ -2212,13 +2212,13 @@ S: 2300 Copenhagen S
 S: Denmark
 
 N: Claudio S. Matsuoka
-E: cmatsuoka@gmail.com
-E: claudio@mandriva.com
+E: claudio@conectiva.com
+E: claudio@helllabs.org
 W: http://helllabs.org/~claudio
-D: V4L, OV511 and HDA-codec hacks
+D: V4L, OV511 driver hacks
 S: Conectiva S.A.
-S: Souza Naves 1250
-S: 80050-040  Curitiba PR
+S: R. Tocantins 89
+S: 80050-430  Curitiba PR
 S: Brazil
 
 N: Heinz Mauelshagen

trunk/Documentation/CodingStyle

@@ -633,27 +633,12 @@ covers RTL which is used frequently with assembly language in the kernel.
 
 Kernel developers like to be seen as literate. Do mind the spelling
 of kernel messages to make a good impression. Do not use crippled
-words like "dont"; use "do not" or "don't" instead.  Make the messages
-concise, clear, and unambiguous.
+words like "dont" and use "do not" or "don't" instead.
 
 Kernel messages do not have to be terminated with a period.
 
 Printing numbers in parentheses (%d) adds no value and should be avoided.
 
-There are a number of driver model diagnostic macros in <linux/device.h>
-which you should use to make sure messages are matched to the right device
-and driver, and are tagged with the right level:  dev_err(), dev_warn(),
-dev_info(), and so forth.  For messages that aren't associated with a
-particular device, <linux/kernel.h> defines pr_debug() and pr_info().
-
-Coming up with good debugging messages can be quite a challenge; and once
-you have them, they can be a huge help for remote troubleshooting.  Such
-messages should be compiled out when the DEBUG symbol is not defined (that
-is, by default they are not included).  When you use dev_dbg() or pr_debug(),
-that's automatic.  Many subsystems have Kconfig options to turn on -DDEBUG.
-A related convention uses VERBOSE_DEBUG to add dev_vdbg() messages to the
-ones already enabled by DEBUG.
-
 
 		Chapter 14: Allocating memory
 
@@ -805,5 +790,4 @@ Kernel CodingStyle, by greg@kroah.com at OLS 2002:
 http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/
 
 --
-Last updated on 2007-July-13.
-
+Last updated on 2006-December-06.

trunk/Documentation/DocBook/Makefile

@@ -15,11 +15,11 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 
 ###
 # The build process is as follows (targets):
-#              (xmldocs) [by docproc]
-# file.tmpl --> file.xml +--> file.ps   (psdocs)   [by db2ps or xmlto]
-#                        +--> file.pdf  (pdfdocs)  [by db2pdf or xmlto]
-#                        +--> DIR=file  (htmldocs) [by xmlto]
-#                        +--> man/      (mandocs)  [by xmlto]
+#              (xmldocs)
+# file.tmpl --> file.xml +--> file.ps   (psdocs)
+#                        +--> file.pdf  (pdfdocs)
+#                        +--> DIR=file  (htmldocs)
+#                        +--> man/      (mandocs)
 
 
 # for PDF and PS output you can choose between xmlto and docbook-utils tools

trunk/Documentation/DocBook/kernel-api.tmpl

@@ -159,6 +159,7 @@ X!Ilib/string.c
 !Earch/i386/lib/usercopy.c
      </sect1>
      <sect1><title>More Memory Management Functions</title>
+!Iinclude/linux/rmap.h
 !Emm/readahead.c
 !Emm/filemap.c
 !Emm/memory.c
@@ -407,10 +408,6 @@ X!Edrivers/pnp/system.c
 !Edrivers/pnp/manager.c
 !Edrivers/pnp/support.c
      </sect1>
-     <sect1><title>Userspace IO devices</title>
-!Edrivers/uio/uio.c
-!Iinclude/linux/uio_driver.h
-     </sect1>
   </chapter>
 
   <chapter id="blkdev">