---

yaml
---
r: 35354
b: refs/heads/master
c: 5457f21
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a319a2773a13bab56a0d0b3744ba8703324313b5
+refs/heads/master: 5457f2194ad198a0aba4190ec99a6a81846fdca5

trunk/.gitignore

@@ -12,9 +12,6 @@
 *.ko
 *.so
 *.mod.c
-*.i
-*.lst
-*.symtypes
 
 #
 # Top-level generic files
@@ -33,11 +30,6 @@ include/config
 include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
-include/linux/utsrelease.h
 
 # stgit generated dirs
 patches-*
-
-# quilt's files
-patches
-series

trunk/CREDITS

@@ -2209,7 +2209,7 @@ S: (address available on request)
 S: USA
 
 N: Ian McDonald
-E: ian.mcdonald@jandi.co.nz
+E: iam4@cs.waikato.ac.nz
 E: imcdnzl@gmail.com
 W: http://wand.net.nz/~iam4
 W: http://imcdnzl.blogspot.com
@@ -2384,13 +2384,6 @@ N: Thomas Molina
 E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
-N: Paul Moore
-E: paul.moore@hp.com
-D: NetLabel author
-S: Hewlett-Packard
-S: 110 Spit Brook Road
-S: Nashua, NH 03062
-
 N: James Morris
 E: jmorris@namei.org
 W: http://namei.org/

trunk/Documentation/00-INDEX

@@ -184,8 +184,6 @@ mtrr.txt
 	- how to use PPro Memory Type Range Registers to increase performance.
 nbd.txt
 	- info on a TCP implementation of a network block device.
-netlabel/
-	- directory with information on the NetLabel subsystem.
 networking/
 	- directory with info on various aspects of networking with Linux.
 nfsroot.txt

trunk/Documentation/DocBook/kernel-api.tmpl

@@ -58,9 +58,6 @@
 !Iinclude/linux/ktime.h
 !Iinclude/linux/hrtimer.h
 !Ekernel/hrtimer.c
-     </sect1>
-     <sect1><title>Workqueues and Kevents</title>
-!Ekernel/workqueue.c
      </sect1>
      <sect1><title>Internal Functions</title>
 !Ikernel/exit.c
@@ -303,7 +300,7 @@ X!Ekernel/module.c
      </sect1>
 
      <sect1><title>Resources Management</title>
-!Ikernel/resource.c
+!Ekernel/resource.c
      </sect1>
 
      <sect1><title>MTRR Handling</title>
@@ -315,7 +312,9 @@ X!Ekernel/module.c
 !Edrivers/pci/pci-driver.c
 !Edrivers/pci/remove.c
 !Edrivers/pci/pci-acpi.c
-!Edrivers/pci/search.c
+<!-- kerneldoc does not understand __devinit
+X!Edrivers/pci/search.c
+ -->
 !Edrivers/pci/msi.c
 !Edrivers/pci/bus.c
 <!-- FIXME: Removed for now since no structured comments in source

trunk/Documentation/SubmittingPatches

@@ -10,9 +10,7 @@ kernel, the process can sometimes be daunting if you're not familiar
 with "the system."  This text is a collection of suggestions which
 can greatly increase the chances of your change being accepted.
 
-Read Documentation/SubmitChecklist for a list of items to check
-before submitting code.  If you are submitting a driver, also read
-Documentation/SubmittingDrivers.
+If you are submitting a driver, also read Documentation/SubmittingDrivers.
 
 
 
@@ -76,6 +74,9 @@ There are a number of scripts which can aid in this:
 Quilt:
 http://savannah.nongnu.org/projects/quilt
 
+Randy Dunlap's patch scripts:
+http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz
+
 Andrew Morton's patch scripts:
 http://www.zip.com.au/~akpm/linux/patches/
 Instead of these scripts, quilt is the recommended patch management
@@ -308,8 +309,6 @@ then you just add a line saying
 
 	Signed-off-by: Random J Developer <random@developer.example.org>
 
-using your real name (sorry, no pseudonyms or anonymous contributions.)
-
 Some people also put extra tags at the end.  They'll just be ignored for
 now, but you can do this to mark internal company procedures or just
 point out some special detail about the sign-off. 
@@ -485,7 +484,7 @@ Greg Kroah-Hartman "How to piss off a kernel subsystem maintainer".
   <http://www.kroah.com/log/2005/10/19/>
   <http://www.kroah.com/log/2006/01/11/>
 
-NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
+NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!.
   <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>
 
 Kernel Documentation/CodingStyle
@@ -494,3 +493,4 @@ Kernel Documentation/CodingStyle
 Linus Torvald's mail on the canonical patch format:
   <http://lkml.org/lkml/2005/4/7/183>
 --
+Last updated on 17 Nov 2005.

trunk/Documentation/accounting/delay-accounting.txt

@@ -64,13 +64,11 @@ Compile the kernel with
 	CONFIG_TASK_DELAY_ACCT=y
 	CONFIG_TASKSTATS=y
 
-Delay accounting is enabled by default at boot up.
-To disable, add
-   nodelayacct
-to the kernel boot options. The rest of the instructions
-below assume this has not been done.
+Enable the accounting at boot time by adding
+the following to the kernel boot options
+	delayacct
 
-After the system has booted up, use a utility
+and after the system has booted up, use a utility
 similar to  getdelays.c to access the delays
 seen by a given task or a task group (tgid).
 The utility also allows a given command to be

trunk/Documentation/cciss.txt

@@ -20,7 +20,6 @@ This driver is known to work with the following cards:
 	* SA P400i
 	* SA E200
 	* SA E200i
-	* SA E500
 
 If nodes are not already created in the /dev/cciss directory, run as root:
 

trunk/Documentation/cpu-freq/user-guide.txt

@@ -153,13 +153,10 @@ scaling_governor,		and by "echoing" the name of another
 				that some governors won't load - they only
 				work on some specific architectures or
 				processors.
-scaling_min_freq and
+scaling_min_freq and 
 scaling_max_freq		show the current "policy limits" (in
 				kHz). By echoing new values into these
 				files, you can change these limits.
-				NOTE: when setting a policy you need to
-				first set scaling_max_freq, then
-				scaling_min_freq.
 
 
 If you have selected the "userspace" governor which allows you to