---

yaml
---
r: 36331
b: refs/heads/master
c: 2ab561a
h: refs/heads/master
i:
  36329: efeb0bc
  36327: 0b6db96
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae3e0218621db0590163b2d5c424ef1f340e3cc6
+refs/heads/master: 2ab561a116e16cdee3ae0e13d51910634c15aee9

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

@@ -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.
@@ -528,11 +523,11 @@ S: Oxford
 S: United Kingdom
 
 N: Luiz Fernando N. Capitulino
-E: lcapitulino@mandriva.com.br
-E: lcapitulino@gmail.com
-W: http://www.cpu.eti.br
-D: misc kernel hacking
-S: Mandriva
+E: lcapitulino@terra.com.br
+E: lcapitulino@prefeitura.sp.gov.br
+W: http://www.telecentros.sp.gov.br
+D: Little fixes and a lot of janitorial work
+S: E-GOV Telecentros SP
 S: Brazil
 
 N: Remy Card
@@ -1578,8 +1573,12 @@ S: 160 00 Praha 6
 S: Czech Republic
 
 N: Niels Kristian Bech Jensen
-E: nkbj1970@hotmail.com
+E: nkbj@image.dk
+W: http://www.image.dk/~nkbj
 D: Miscellaneous kernel updates and fixes.
+S: Dr. Holsts Vej 34, lejl. 164
+S: DK-8230 �byh�j
+S: Denmark
 
 N: Michael K. Johnson
 E: johnsonm@redhat.com
@@ -2209,7 +2208,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
@@ -3401,10 +3400,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/Changes

@@ -181,8 +181,8 @@ Intel IA32 microcode
 --------------------
 
 A driver has been added to allow updating of Intel IA32 microcode,
-accessible as a normal (misc) character device.  If you are not using
-udev you may need to:
+accessible as both a devfs regular file and as a normal (misc)
+character device.  If you are not using devfs you may need to:
 
 mkdir /dev/cpu
 mknod /dev/cpu/microcode c 10 184
@@ -201,9 +201,7 @@ with programs using shared memory.
 udev
 ----
 udev is a userspace application for populating /dev dynamically with
-only entries for devices actually present.  udev replaces the basic
-functionality of devfs, while allowing persistant device naming for
-devices.
+only entries for devices actually present. udev replaces devfs.
 
 FUSE
 ----
@@ -233,13 +231,18 @@ The PPP driver has been restructured to support multilink and to
 enable it to operate over diverse media layers.  If you use PPP,
 upgrade pppd to at least 2.4.0.
 
-If you are not using udev, you must have the device file /dev/ppp
+If you are not using devfs, you must have the device file /dev/ppp
 which can be made by:
 
 mknod /dev/ppp c 108 0
 
 as root.
 
+If you use devfsd and build ppp support as modules, you will need
+the following in your /etc/devfsd.conf file:
+
+LOOKUP	PPP	MODLOAD
+
 Isdn4k-utils
 ------------