---

yaml --- r: 21759 b: refs/heads/master c: bfd6057 h: refs/heads/master i: 21757: 4b26a32 21755: 999dba0 21751: 37f1dff 21743: 27c86b6 21727: 35d4433 21695: c99eaaf 21631: f17612a 21503: f10775e v: v3
git-mirror · Jan 18, 2006 · 38ff71a · 38ff71a
1 parent 273e9e2
commit 38ff71a
Show file tree

Hide file tree

Showing 2,955 changed files with 57,063 additions and 103,694 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0481730c827421cf1548bfd73c073c0f47f2907
+refs/heads/master: bfd6057959ecd3ff779a373a4d07cda2c2d0eec1
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -30,5 +30,3 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 
-# stgit generated dirs
-patches-*
diff --git a/trunk/CREDITS b/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
 
@@ -3100,7 +3101,7 @@ S: Minto, NSW, 2566
 S: Australia
 
 N: Stephen Smalley
-E: sds@tycho.nsa.gov
+E: sds@epoch.ncsc.mil
 D: portions of the Linux Security Module (LSM) framework and security modules
 
 N: Chris Smith
@@ -3642,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

diff --git a/trunk/Documentation/DocBook/Makefile b/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
 
 ###