---

yaml --- r: 7216 b: refs/heads/master c: 6d983fe h: refs/heads/master v: v3
git-mirror · Jul 12, 2005 · e016051 · e016051
1 parent 4604446
commit e016051
Show file tree

Hide file tree

Showing 3,911 changed files with 128,125 additions and 300,569 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f65e77693aa5a1cf688fc378bc6913a56f9ff7b7
+refs/heads/master: 6d983feab80948cdd0e3920c40d453a6436eeb23
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
 D: fbdev hacking
 
 N: Jesper Juhl
-E: jesper.juhl@gmail.com
-D: Various fixes, cleanups and minor features.
+E: juhl-lkml@dif.dk
+D: Various small janitor fixes, cleanups etc.
 S: Lemnosvej 1, 3.tv
-S: 2300 Copenhagen S.
+S: 2300 Copenhagen S
 S: Denmark
 
 N: Jozsef Kadlecsik
@@ -2380,8 +2380,8 @@ E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
 N: James Morris
-E: jmorris@namei.org
-W: http://namei.org/
+E: jmorris@redhat.com
+W: http://www.intercode.com.au/jmorris/
 D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
 D: Crypto API, general networking, miscellaneous.
 S: PO Box 707
@@ -2423,7 +2423,8 @@ S: Toronto, Ontario
 S: Canada
 
 N: Zwane Mwaikambo
-E: zwane@arm.linux.org.uk
+E: zwane@linuxpower.ca
+W: http://function.linuxpower.ca
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging

diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes
@@ -65,7 +65,6 @@ 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
 
 Kernel compilation
 ==================

diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches
@@ -149,11 +149,6 @@ USB, framebuffer devices, the VFS, the SCSI subsystem, etc.  See the
 MAINTAINERS file for a mailing list that relates specifically to
 your change.
 
-If changes affect userland-kernel interfaces, please send
-the MAN-PAGES maintainer (as listed in the MAINTAINERS file)
-a man-pages patch, or at least a notification of the change,
-so that some information makes its way into the manual pages.
-
 Even if the maintainer did not respond in step #4, make sure to ALWAYS
 copy the maintainer when you change their code.
 

diff --git a/trunk/Documentation/acpi-hotkey.txt b/trunk/Documentation/acpi-hotkey.txt
diff --git a/trunk/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/trunk/Documentation/arm/Samsung-S3C24XX/USB-Host.txt
diff --git a/trunk/Documentation/crypto/api-intro.txt b/trunk/Documentation/crypto/api-intro.txt
@@ -223,7 +223,6 @@ CAST5 algorithm contributors:
 
 TEA/XTEA algorithm contributors:
   Aaron Grothe
-  Michael Ringe
 
 Khazad algorithm contributors:
   Aaron Grothe

diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff
@@ -41,7 +41,6 @@ COPYING
 CREDITS
 CVS
 ChangeSet
-Image
 Kerntypes
 MODS.txt
 Module.symvers
@@ -104,8 +103,6 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
-mach-types
-mach-types.h
 make_times_h
 map
 maui_boot.h

diff --git a/trunk/Documentation/fb/vesafb.txt b/trunk/Documentation/fb/vesafb.txt
@@ -144,21 +144,7 @@ vgapal	Use the standard vga registers for palette changes.
 	This is the default.
 pmipal	Use the protected mode interface for palette changes.
 
-mtrr:n	setup memory type range registers for the vesafb framebuffer
-	where n:
-	      0 - disabled (equivalent to nomtrr)
-	      1 - uncachable
-	      2 - write-back
-	      3 - write-combining (default)
-	      4 - write-through
-
-	If you see the following in dmesg, choose the type that matches the
-	old one. In this example, use "mtrr:2".
-...
-mtrr: type mismatch for e0000000,8000000 old: write-back new: write-combining
-...
-
-nomtrr  disable mtrr
+mtrr	setup memory type range registers for the vesafb framebuffer.
 
 vremap:n
         remap 'n' MiB of video RAM. If 0 or not specified, remap memory

diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt
@@ -102,6 +102,16 @@ Who:	Jody McIntyre <scjody@steamballoon.com>
 
 ---------------------------
 
+What:	register_serial/unregister_serial
+When:	December 2005
+Why:	This interface does not allow serial ports to be registered against
+	a struct device, and as such does not allow correct power management
+	of such ports.  8250-based ports should use serial8250_register_port
+	and serial8250_unregister_port instead.
+Who:	Russell King <rmk@arm.linux.org.uk>
+
+---------------------------
+
 What:	i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
 When:	November 2005
 Files:	drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
@@ -125,15 +135,3 @@ Why:	With the 16-bit PCMCIA subsystem now behaving (almost) like a
 	pcmciautils package available at
 	http://kernel.org/pub/linux/utils/kernel/pcmcia/
 Who:	Dominik Brodowski <linux@brodo.de>
-
----------------------------
-
-What:	ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)
-When:	December 2005
-Why:	This interface has been obsoleted by the new layer3-independent
-	"nfnetlink_queue".  The Kernel interface is compatible, so the old
-	ip[6]tables "QUEUE" targets still work and will transparently handle
-	all packets into nfnetlink queue number 0.  Userspace users will have
-	to link against API-compatible library on top of libnfnetlink_queue 
-	instead of the current 'libipq'.
-Who:	Harald Welte <laforge@netfilter.org>