---

yaml
---
r: 31269
b: refs/heads/master
c: d8deac5
h: refs/heads/master
i:
  31267: aa2db5d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82991c6f2c361acc17279b8124d9bf1878973435
+refs/heads/master: d8deac5094988c7ad1127ee61f52c59a952fcabb

trunk/CREDITS

@@ -24,11 +24,6 @@ S: C. Negri 6, bl. D3
 S: Iasi 6600
 S: Romania
 
-N: Mark Adler
-E: madler@alumni.caltech.edu
-W: http://alumnus.caltech.edu/~madler/
-D: zlib decompression
-
 N: Monalisa Agrawal
 E: magrawal@nortelnetworks.com
 D: Basic Interphase 5575 driver with UBR and ABR support.
@@ -3401,10 +3396,10 @@ S: Czech Republic
 
 N: Thibaut Varene
 E: T-Bone@parisc-linux.org
-W: http://www.parisc-linux.org/~varenet/
+W: http://www.parisc-linux.org/
 P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C  FA2F 1E32 C3DA B7D2 F063
 D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
-D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
+D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there
 D: AD1889 sound driver
 S: Paris, France
 

trunk/Documentation/DocBook/Makefile

@@ -10,8 +10,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 \
-	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    genericirq.xml
+	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml
 
 ###
 # The build process is as follows (targets):