---

yaml
---
r: 69352
b: refs/heads/master
c: 20b3cdd
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85ffdd28be04c324349dfc7c9de3d4342c885c3f
+refs/heads/master: 20b3cdd6773be09f7bf52113de0d0c37da287f29

trunk/.gitignore

@@ -7,7 +7,6 @@
 #
 .*
 *.o
-*.o.*
 *.a
 *.s
 *.ko
@@ -23,7 +22,6 @@
 tags
 TAGS
 vmlinux*
-!vmlinux.lds.S
 System.map
 Module.symvers
 

trunk/CREDITS

@@ -665,11 +665,6 @@ D: Minor updates to SCSI types, added /proc/pid/maps protection
 S: (ask for current address)
 S: USA
 
-N: Robin Cornelius
-E: robincornelius@users.sourceforge.net
-D: Ralink rt2x00 WLAN driver
-S: Cornwall, U.K.
-
 N: Mark Corner
 E: mcorner@umich.edu
 W: http://www.eecs.umich.edu/~mcorner/
@@ -684,11 +679,6 @@ D: Kernel module SMART utilities
 S: Santa Cruz, California
 S: USA
 
-N: Luis Correia
-E: lfcorreia@users.sf.net
-D: Ralink rt2x00 WLAN driver
-S: Belas, Portugal
-
 N: Alan Cox
 W: http://www.linux.org.uk/diary/
 D: Linux Networking (0.99.10->2.0.29)
@@ -843,12 +833,6 @@ S: Lancs
 S: PR4 6AX
 S: United Kingdom
 
-N: Ivo van Doorn
-E: IvDoorn@gmail.com
-W: http://www.mendiosus.nl
-D: Ralink rt2x00 WLAN driver
-S: Haarlem, The Netherlands
-
 N: John G Dorsey
 E: john+@cs.cmu.edu
 D: ARM Linux ports to Assabet/Neponset, Spot
@@ -982,7 +966,6 @@ N: Pekka Enberg
 E: penberg@cs.helsinki.fi
 W: http://www.cs.helsinki.fi/u/penberg/
 D: Various kernel hacks, fixes, and cleanups.
-D: Slab allocators
 S: Finland
 
 N: David Engebretsen
@@ -1956,8 +1939,8 @@ D: for Menuconfig's lxdialog.
 N: Christoph Lameter
 E: christoph@lameter.com
 D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
-D: NUMA support, Slab allocators, Page migration
-D: Scalability, Time subsystem
+D: Early protocol filter for bridging code
+D: Bug fixes
 
 N: Paul Laufer
 E: paul@laufernet.com
@@ -2229,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
@@ -3533,12 +3516,6 @@ S: Maastrichterweg 63
 S: 5554 GG Valkenswaard
 S: The Netherlands
 
-N: Mark Wallis
-E: mwallis@serialmonkey.com
-W: http://mark.serialmonkey.com
-D: Ralink rt2x00 WLAN driver
-S: Newcastle, Australia
-
 N: Peter Shaobo Wang
 E: pwang@mmdcorp.com
 W: http://www.mmdcorp.com/pw/linux
@@ -3673,15 +3650,6 @@ S: Alte Regensburger Str. 11a
 S: 93149 Nittenau
 S: Germany
 
-N: Gertjan van Wingerde
-E: gwingerde@home.nl
-D: Ralink rt2x00 WLAN driver
-D: Minix V2 file-system
-D: Misc fixes
-S: Geessinkweg 177
-S: 7544 TX Enschede
-S: The Netherlands
-
 N: Lars Wirzenius
 E: liw@iki.fi
 D: Linux System Administrator's Guide, author, former maintainer

trunk/Documentation/00-INDEX

@@ -134,6 +134,8 @@ dvb/
 	- info on Linux Digital Video Broadcast (DVB) subsystem.
 early-userspace/
 	- info about initramfs, klibc, and userspace early during boot.
+ecryptfs.txt
+	- docs on eCryptfs: stacked cryptographic filesystem for Linux.
 eisa.txt
 	- info on EISA bus support.
 exception.txt

trunk/Documentation/Changes

@@ -45,7 +45,6 @@ o  nfs-utils              1.0.5                   # showmount --version
 o  procps                 3.2.0                   # ps --version
 o  oprofile               0.9                     # oprofiled --version
 o  udev                   081                     # udevinfo -V
-o  grub                   0.93                    # grub --version
 
 Kernel compilation
 ==================

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.