Merge with 2.4.0-test1.

5 files changed, 47 insertions, 6 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 4d7b936a3..86a6f345f 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -12647,6 +12647,21 @@ CONFIG_MICROCODE
   The module will be called microcode.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
+/dev/cpu/*/msr - Model-specific register support
+CONFIG_X86_MSR
+  This device gives privileged processes access to the x86
+  Model-Specific Registers (MSRs).  It is a character device with
+  major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr.
+  MSR accesses are directed to a specific CPU on multi-processor
+  systems.
+
+/dev/cpu/*/cpuid - CPU information support
+CONFIG_X86_CPUID
+  This device gives processes access to the x86 CPUID instruction to
+  be executed on a specific processor.  It is a character device
+  with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
+  /dev/cpu/31/cpuid.
+
 Enhanced Real Time Clock Support
 CONFIG_RTC
   If you say Y here and create a character special file /dev/rtc with
@@ -14830,6 +14845,14 @@ CONFIG_VIDEO_DEV
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
+Video For Linux /proc file system information
+CONFIG_VIDEO_PROC_FS
+  If you say Y here, you are able to access video device information
+  in /proc/video.
+
+  To use this option, you have to check, that the "/proc file system
+  support" (CONFIG_PROC_FS) is enabled too.
+
 AIMSlab RadioTrack (aka RadioReveal) support
 CONFIG_RADIO_RTRACK
   Choose Y here if you have one of these FM radio cards, and then fill
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 8a40bfade..0f84cb218 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -24,6 +24,12 @@ db2ps db2pdf:
 $(TOPDIR)/scripts/docproc:
 	$(MAKE) -C $(TOPDIR)/scripts docproc
 
+kernel-hacking.sgml: kernel-hacking.tmpl
+	$(TOPDIR)/scripts/docgen <$< >$@
+
+kernel-locking.sgml: kernel-locking.tmpl
+	$(TOPDIR)/scripts/docgen <$< >$@
+
 wanbook.sgml: wanbook.tmpl
 	$(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/net/wan/syncppp.c \
 		<wanbook.tmpl >wanbook.sgml
diff --git a/Documentation/fb/modedb.txt b/Documentation/fb/modedb.txt
index 01fd784a2..049c4cd84 100644
--- a/Documentation/fb/modedb.txt
+++ b/Documentation/fb/modedb.txt
@@ -41,8 +41,20 @@ fb_find_mode() first tries the specified video mode (or any mode that matches,
 e.g. there can be multiple 640x480 modes, each of them is tried). If that
 fails, the default mode is tried. If that fails, it walks over all modes.
 
-BTW, only a few drivers use this at the moment. Others are to follow
-(feel free to send patches).
+To specify a video mode at bootup, use the following boot options:
+    video=<driver>:<xres>x<yres>[-<bpp>][@refresh]
+
+where <driver> is a name from the table below.  Valid default modes can be
+found in linux/drivers/video/modedb.c.  Check your driver's documentation.
+There may be more modes.
 
+    Drivers that support modedb boot options
+    Boot Name	  Cards Supported
 
+    ami		- Amiga chipset frame buffer
+    aty128fb	- ATI Rage128 / Pro frame buffer
+    atyfb	- ATI Mach64 frame buffer
+    tdfx	- 3D Fx frame buffer
 
+BTW, only a few drivers use this at the moment. Others are to follow
+(feel free to send patches).
diff --git a/Documentation/sound/OPL3-SA2 b/Documentation/sound/OPL3-SA2
index e6bca7089..d43ba0475 100644
--- a/Documentation/sound/OPL3-SA2
+++ b/Documentation/sound/OPL3-SA2
@@ -1,7 +1,7 @@
 Documentation for the OPL3-SA2, SA3, and SAx driver (opl3sa2.o)
 ---------------------------------------------------------------
 
-Scott Murray, scottm@interlog.com
+Scott Murray, scott@spiteful.org
 January 5, 1999
 
 NOTE: All trade-marked terms mentioned below are properties of their
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index d57cc2e23..65a0c4caa 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -6,8 +6,8 @@ Author: Mark McClelland
 Homepage: http://alpha.dyndns.org/ov511
 
 NEW IN THIS VERSION:
- o 352x288 mode
- o force_rgb parameter for apps that expect RGB instead of BGR
+ o 384x288 and 448x336 modes
+ o better /proc/video support
 
 INTRODUCTION:
 
@@ -179,7 +179,7 @@ MODULE PARAMETERS:
         your colors look VERY wrong, you may want to change this.
 
 WORKING FEATURES:
- o Color streaming/capture at 640x480, 352x288, and 320x240
+ o Color streaming/capture at 640x480, 448x336, 384x288, 352x288, and 320x240
  o YUV420 color
  o Monochrome
  o Setting/getting of saturation, contrast and brightness (no hue yet; only