Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

mariux64 · Oct 28, 2005 · a4da062 · a4da062
2 parents 70a30e1 + 2073194
commit a4da062
Show file tree

Hide file tree

Showing 1,055 changed files with 36,246 additions and 19,362 deletions.
diff --git a/CREDITS b/CREDITS
@@ -2247,6 +2247,12 @@ S: 249 Nichols Avenue
 S: Syracuse, New York 13206
 S: USA
 
+N: Kyle McMartin
+E: kyle@parisc-linux.org
+D: Linux/PARISC hacker
+D: AD1889 sound driver
+S: Ottawa, Canada
+
 N: Dirk Melchers
 E: dirk@merlin.nbg.sub.org
 D: 8 bit XT hard disk driver for OMTI5520

diff --git a/Documentation/Changes b/Documentation/Changes
@@ -65,7 +65,7 @@ o  isdn4k-utils           3.1pre1                 # isdnctrl 2>&1|grep version
 o  nfs-utils              1.0.5                   # showmount --version
 o  procps                 3.2.0                   # ps --version
 o  oprofile               0.9                     # oprofiled --version
-o  udev                   058                     # udevinfo -V
+o  udev                   071                     # udevinfo -V
 
 Kernel compilation
 ==================