---

yaml
---
r: 22517
b: refs/heads/master
c: 24669f7
h: refs/heads/master
i:
  22515: 5810a81
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cae7e26f245151b9ccad868bf2edf8c8048d307
+refs/heads/master: 24669f75a3231fa37444977c92d1f4838bec1233

trunk/.gitignore

@@ -30,5 +30,3 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 
-# stgit generated dirs
-patches-*

trunk/CREDITS

@@ -120,6 +120,7 @@ D: Author of lil (Linux Interrupt Latency benchmark)
 D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
 D: VM hacker
 D: Various other kernel hacks
+S: Via Cicalini 26
 S: Imola 40026
 S: Italy
 
@@ -2813,8 +2814,6 @@ E: luca.risolia@studio.unibo.it
 P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4
 D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
 D: V4L2 driver for SN9C10x PC Camera Controllers
-D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers
-D: V4L2 driver for ZC0301 Image Processor and Control Chip
 S: Via Liberta' 41/A
 S: Osio Sotto, 24046, Bergamo
 S: Italy
@@ -3644,9 +3643,11 @@ S: Cambridge. CB1 7EG
 S: England
 
 N: Chris Wright
-E: chrisw@sous-sol.org
+E: chrisw@osdl.org
 D: hacking on LSM framework and security modules.
-S: Portland, OR
+S: c/o OSDL
+S: 12725 SW Millikan Way, Suite 400
+S: Beaverton, OR 97005
 S: USA
 
 N: Michal Wronski

trunk/Documentation/Changes

@@ -15,6 +15,24 @@ and therefore owes credit to the same people as that file (Jared Mauch,
 Axel Boldt, Alessandro Sigala, and countless other users all over the
 'net).
 
+The latest revision of this document, in various formats, can always
+be found at <http://cyberbuzz.gatech.edu/kaboom/linux/Changes-2.4/>.
+
+Feel free to translate this document.  If you do so, please send me a
+URL to your translation for inclusion in future revisions of this
+document.
+
+Smotrite file <http://oblom.rnc.ru/linux/kernel/Changes.ru>, yavlyaushisya
+russkim perevodom dannogo documenta.
+
+Visite <http://www2.adi.uam.es/~ender/tecnico/> para obtener la traducci�n
+al espa�ol de este documento en varios formatos.
+
+Eine deutsche Version dieser Datei finden Sie unter
+<http://www.stefan-winter.de/Changes-2.4.0.txt>.
+
+Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu).
+
 Current Minimal Requirements
 ============================
 

trunk/Documentation/DocBook/Makefile

@@ -9,7 +9,7 @@
 DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml \
-	    kernel-api.xml journal-api.xml lsm.xml usb.xml \
+	    sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml
 
 ###