7 files changed, 144 insertions, 37 deletions

diff --git a/Documentation/aoe/mkshelf.sh b/Documentation/aoe/mkshelf.sh
index 8bacf9f2c7cc..32615814271c 100644
--- a/Documentation/aoe/mkshelf.sh
+++ b/Documentation/aoe/mkshelf.sh
@@ -8,13 +8,15 @@ fi
 n_partitions=${n_partitions:-16}
 dir=$1
 shelf=$2
+nslots=16
+maxslot=`echo $nslots 1 - p | dc`
 MAJOR=152
 
 set -e
 
-minor=`echo 10 \* $shelf \* $n_partitions | bc`
+minor=`echo $nslots \* $shelf \* $n_partitions | bc`
 endp=`echo $n_partitions - 1 | bc`
-for slot in `seq 0 9`; do
+for slot in `seq 0 $maxslot`; do
         for part in `seq 0 $endp`; do
                 name=e$shelf.$slot
                 test "$part" != "0" && name=${name}p$part
diff --git a/Documentation/fb/intel810.txt b/Documentation/fb/intel810.txt
index fd68b162e4a1..4f0d6bc789ef 100644
--- a/Documentation/fb/intel810.txt
+++ b/Documentation/fb/intel810.txt
@@ -5,6 +5,7 @@ Intel 810/815 Framebuffer driver
         March 17, 2002
 
         First Released: July 2001
+        Last Update:    September 12, 2005
 ================================================================
 
 A. Introduction
@@ -44,6 +45,8 @@ B.  Features
 
         - Hardware Cursor Support
  
+        - Supports EDID probing either by DDC/I2C or through the BIOS
+
 C.  List of available options
         
    a. "video=i810fb"  
@@ -52,14 +55,17 @@ C.  List of available options
         Recommendation: required
  
    b. "xres:<value>"  
-        select horizontal resolution in pixels
+        select horizontal resolution in pixels. (This parameter will be
+        ignored if 'mode_option' is specified.  See 'o' below).
 
         Recommendation: user preference 
         (default = 640)
 
    c. "yres:<value>"
         select vertical resolution in scanlines. If Discrete Video Timings
-        is enabled, this will be ignored and computed as 3*xres/4.  
+        is enabled, this will be ignored and computed as 3*xres/4.  (This
+        parameter will be ignored if 'mode_option' is specified.  See 'o'
+        below)  
 
         Recommendation: user preference
         (default = 480)
@@ -86,7 +92,8 @@ C.  List of available options
    g. "hsync1/hsync2:<value>" 
         select the minimum and maximum Horizontal Sync Frequency of the 
         monitor in KHz.  If a using a fixed frequency monitor, hsync1 must 
-        be equal to hsync2. 
+        be equal to hsync2. If EDID probing is successful, these will be
+        ignored and values will be taken from the EDID block.
 
         Recommendation: check monitor manual for correct values
         default (29/30)
@@ -94,7 +101,8 @@ C.  List of available options
    h. "vsync1/vsync2:<value>" 
         select the minimum and maximum Vertical Sync Frequency of the monitor
         in Hz. You can also use this option to lock your monitor's refresh 
-        rate.
+        rate. If EDID probing is successful, these will be ignored and values
+        will be taken from the EDID block.
 
         Recommendation: check monitor manual for correct values
         (default = 60/60)
@@ -154,7 +162,11 @@ C.  List of available options
 
         Recommendation: do not set
         (default = not set)
-                        
+   o. <xres>x<yres>[-<bpp>][@<refresh>]
+        The driver will now accept specification of boot mode option.  If this
+        is specified, the options 'xres' and 'yres' will be ignored. See
+        Documentation/fb/modedb.txt for usage.
+
 D. Kernel booting
 
 Separate each option/option-pair by commas (,) and the option from its value
@@ -176,7 +188,10 @@ will be computed based on the hsync1/hsync2 and vsync1/vsync2 values.
 
 IMPORTANT:
 You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes
-better than 640x480 at 60Hz.
+better than 640x480 at 60Hz. HOWEVER, if your chipset/display combination
+supports I2C and has an EDID block, you can safely exclude hsync1, hsync2,
+vsync1 and vsync2 parameters.  These parameters will be taken from the EDID
+block.
 
 E.  Module options
         
@@ -217,32 +232,21 @@ F.  Setup
            This is required.  The option is under "Character Devices"
 
         d. Under "Graphics Support", select "Intel 810/815" either statically
-           or as a module.  Choose "use VESA GTF for video timings"  if you 
-           need to maximize the capability of your display.  To be on the 
+           or as a module.  Choose "use VESA Generalized Timing Formula" if
+           you need to maximize the capability of your display.  To be on the 
            safe side, you can leave this unselected.  
   
-        e. If you want a framebuffer console, enable it under "Console 
+        e. If you want support for DDC/I2C probing (Plug and Play Displays),
+           set 'Enable DDC Support' to 'y'. To make this option appear, set
+           'use VESA Generalized Timing Formula' to 'y'.
+
+        f. If you want a framebuffer console, enable it under "Console 
            Drivers"
 
-        f. Compile your kernel. 
+        g. Compile your kernel. 
                 
-        g. Load the driver as described in section D and E.
+        h. Load the driver as described in section D and E.
         
-        Optional:       
-        h.  If you are going to run XFree86 with its native drivers, the 
-            standard XFree86 4.1.0 and 4.2.0 drivers should work as is.
-            However, there's a bug in the XFree86 i810 drivers.  It attempts 
-            to use XAA even when switched to the console. This will crash
-            your server. I have a fix at this site:  
-            
-            http://i810fb.sourceforge.net.  
-
-            You can either use the patch, or just replace 
-            
-            /usr/X11R6/lib/modules/drivers/i810_drv.o
-
-            with the one provided at the website.       
-
         i.  Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver
             patch to see the chipset in action (or inaction :-).
 
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c
index e1c56a7e6583..4bef8c25172c 100644
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/Documentation/firmware_class/firmware_sample_driver.c
@@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size)
         u8 buf[size+1];
         memcpy(buf, firmware, size);
         buf[size] = '\0';
-        printk("firmware_sample_driver: firmware: %s\n", buf);
+        printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
 }
 
 static void sample_probe_default(void)
 {
         /* uses the default method to get the firmware */
         const struct firmware *fw_entry;
-        printk("firmware_sample_driver: a ghost device got inserted :)\n");
+        printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
         {
@@ -61,7 +61,7 @@ static void sample_probe_specific(void)
 
         /* NOTE: This currently doesn't work */
 
-        printk("firmware_sample_driver: a ghost device got inserted :)\n");
+        printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
         {
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
                 return;
         }
 
-        printk("firmware_sample_driver: device pointer \"%s\"\n",
+        printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
                (char *)context);
         sample_firmware_load(fw->data, fw->size);
 }
diff --git a/Documentation/input/appletouch.txt b/Documentation/input/appletouch.txt
new file mode 100644
index 000000000000..b48d11d0326d
--- /dev/null
+++ b/Documentation/input/appletouch.txt
@@ -0,0 +1,84 @@
+Apple Touchpad Driver (appletouch)
+----------------------------------
+        Copyright (C) 2005 Stelian Pop <stelian@popies.net>
+
+appletouch is a Linux kernel driver for the USB touchpad found on post
+February 2005 Apple Alu Powerbooks.
+
+This driver is derived from Johannes Berg's appletrackpad driver[1], but it has
+been improved in some areas:
+        * appletouch is a full kernel driver, no userspace program is necessary
+        * appletouch can be interfaced with the synaptics X11 driver, in order
+          to have touchpad acceleration, scrolling, etc.
+
+Credits go to Johannes Berg for reverse-engineering the touchpad protocol,
+Frank Arnold for further improvements, and Alex Harper for some additional
+information about the inner workings of the touchpad sensors.
+
+Usage:
+------
+
+In order to use the touchpad in the basic mode, compile the driver and load
+the module. A new input device will be detected and you will be able to read
+the mouse data from /dev/input/mice (using gpm, or X11).
+
+In X11, you can configure the touchpad to use the synaptics X11 driver, which
+will give additional functionalities, like acceleration, scrolling, 2 finger
+tap for middle button mouse emulation, 3 finger tap for right button mouse
+emulation, etc. In order to do this, make sure you're using a recent version of
+the synaptics driver (tested with 0.14.2, available from [2]), and configure a
+new input device in your X11 configuration file (take a look below for an
+example). For additional configuration, see the synaptics driver documentation.
+
+        Section "InputDevice"
+                Identifier      "Synaptics Touchpad"
+                Driver          "synaptics"
+                Option          "SendCoreEvents"        "true"
+                Option          "Device"                "/dev/input/mice"
+                Option          "Protocol"              "auto-dev"
+                Option          "LeftEdge"              "0"
+                Option          "RightEdge"             "850"
+                Option          "TopEdge"               "0"
+                Option          "BottomEdge"            "645"
+                Option          "MinSpeed"              "0.4"
+                Option          "MaxSpeed"              "1"
+                Option          "AccelFactor"           "0.02"
+                Option          "FingerLow"             "0"
+                Option          "FingerHigh"            "30"
+                Option          "MaxTapMove"            "20"
+                Option          "MaxTapTime"            "100"
+                Option          "HorizScrollDelta"      "0"
+                Option          "VertScrollDelta"       "30"
+                Option          "SHMConfig"             "on"
+        EndSection
+
+        Section "ServerLayout"
+                ...
+                InputDevice     "Mouse"
+                InputDevice     "Synaptics Touchpad"
+        ...
+        EndSection
+
+Fuzz problems:
+--------------
+
+The touchpad sensors are very sensitive to heat, and will generate a lot of
+noise when the temperature changes. This is especially true when you power-on
+the laptop for the first time.
+
+The appletouch driver tries to handle this noise and auto adapt itself, but it
+is not perfect. If finger movements are not recognized anymore, try reloading
+the driver.
+
+You can activate debugging using the 'debug' module parameter. A value of 0
+deactivates any debugging, 1 activates tracing of invalid samples, 2 activates
+full tracing (each sample is being traced):
+        modprobe appletouch debug=1
+                or
+        echo "1" > /sys/module/appletouch/parameters/debug
+
+Links:
+------
+
+[1]: http://johannes.sipsolutions.net/PowerBook/touchpad/
+[2]: http://web.telia.com/~u89404340/touchpad/index.html
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index db2603ceabba..7086f0a90d14 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -164,6 +164,15 @@ running once the system is up.
                         over-ride platform specific driver.
                         See also Documentation/acpi-hotkey.txt.
 
+        enable_timer_pin_1 [i386,x86-64]
+                        Enable PIN 1 of APIC timer
+                        Can be useful to work around chipset bugs (in particular on some ATI chipsets)
+                        The kernel tries to set a reasonable default.
+
+        disable_timer_pin_1 [i386,x86-64]
+                        Disable PIN 1 of APIC timer
+                        Can be useful to work around chipset bugs.
+
         ad1816=         [HW,OSS]
                         Format: <io>,<irq>,<dma>,<dma2>
                         See also Documentation/sound/oss/AD1816.
diff --git a/Documentation/usb/proc_usb_info.txt b/Documentation/usb/proc_usb_info.txt
index 729c72d34c89..f86550fe38ee 100644
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
@@ -20,7 +20,7 @@ the /proc/bus/usb/BBB/DDD files.
 
           to /etc/fstab.  This will mount usbfs at each reboot.
           You can then issue `cat /proc/bus/usb/devices` to extract
-          USB device information, and user mode drivers can use usbfs 
+          USB device information, and user mode drivers can use usbfs
           to interact with USB devices.
 
           There are a number of mount options supported by usbfs.
@@ -32,7 +32,7 @@ the /proc/bus/usb/BBB/DDD files.
           still see references to the older "usbdevfs" name.
 
 For more information on mounting the usbfs file system, see the
-"USB Device Filesystem" section of the USB Guide. The latest copy 
+"USB Device Filesystem" section of the USB Guide. The latest copy
 of the USB Guide can be found at http://www.linux-usb.org/
 
 
@@ -133,7 +133,7 @@ B:  Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd
     are the only transfers that reserve bandwidth.  Control and bulk
     transfers use all other bandwidth, including reserved bandwidth that
     is not used for transfers (such as for short packets).
-    
+
     The percentage is how much of the "reserved" bandwidth is scheduled by
     those transfers.  For a low or full speed bus (loosely, "USB 1.1"),
     90% of the bus bandwidth is reserved.  For a high speed bus (loosely,
@@ -197,7 +197,7 @@ C:* #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA
 | | |__NumberOfInterfaces
 | |__ "*" indicates the active configuration (others are " ")
 |__Config info tag
-    
+
     USB devices may have multiple configurations, each of which act
     rather differently.  For example, a bus-powered configuration
     might be much less capable than one that is self-powered.  Only
@@ -228,7 +228,7 @@ I:  If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=ssss
     For example, default settings may not use more than a small
     amount of periodic bandwidth.  To use significant fractions
     of bus bandwidth, drivers must select a non-default altsetting.
-    
+
     Only one setting for an interface may be active at a time, and
     only one driver may bind to an interface at a time.  Most devices
     have only one alternate setting per interface.
@@ -297,18 +297,21 @@ S:  SerialNumber=dce0
 C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=  0mA
 I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub
 E:  Ad=81(I) Atr=03(Int.) MxPS=   8 Ivl=255ms
+
 T:  Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 4
 D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
 P:  Vendor=0451 ProdID=1446 Rev= 1.00
 C:* #Ifs= 1 Cfg#= 1 Atr=e0 MxPwr=100mA
 I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub
 E:  Ad=81(I) Atr=03(Int.) MxPS=   1 Ivl=255ms
+
 T:  Bus=00 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#=  3 Spd=1.5 MxCh= 0
 D:  Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
 P:  Vendor=04b4 ProdID=0001 Rev= 0.00
 C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=100mA
 I:  If#= 0 Alt= 0 #EPs= 1 Cls=03(HID  ) Sub=01 Prot=02 Driver=mouse
 E:  Ad=81(I) Atr=03(Int.) MxPS=   3 Ivl= 10ms
+
 T:  Bus=00 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#=  4 Spd=12  MxCh= 0
 D:  Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
 P:  Vendor=0565 ProdID=0001 Rev= 1.08
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 678e8f192db2..ffe1c062088b 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -11,6 +11,11 @@ Machine check
                If your BIOS doesn't do that it's a good idea to enable though
                to make sure you log even machine check events that result
                in a reboot.
+   mce=tolerancelevel (number)
+                0: always panic, 1: panic if deadlock possible,
+                2: try to avoid panic, 3: never panic or exit (for testing)
+                default is 1
+                Can be also set using sysfs which is preferable.
 
    nomce (for compatibility with i386): same as mce=off