258 files changed, 6022 insertions, 2383 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 5405f7aecefc..8dfc6708a257 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -130,8 +130,6 @@ edac.txt
        - information on EDAC - Error Detection And Correction
 eisa.txt
        - info on EISA bus support.
-exception.txt
-        - how Linux v2.2 handles exceptions without verify_area etc.
 fault-injection/
        - dir with docs about the fault injection capabilities infrastructure.
 fb/
@@ -234,6 +232,8 @@ memory.txt
        - info on typical Linux memory problems.
 mips/
        - directory with info about Linux on MIPS architecture.
+mmc/
+        - directory with info about the MMC subsystem
 mono.txt
        - how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
 mutex-design.txt
diff --git a/Documentation/ABI/testing/debugfs-ec b/Documentation/ABI/testing/debugfs-ec
new file mode 100644
index 000000000000..6546115a94da
--- /dev/null
+++ b/Documentation/ABI/testing/debugfs-ec
@@ -0,0 +1,20 @@
+What:           /sys/kernel/debug/ec/*/{gpe,use_global_lock,io}
+Date:           July 2010
+Contact:        Thomas Renninger <trenn@suse.de>
+Description:
+General information like which GPE is assigned to the EC and whether
+the global lock should get used.
+Knowing the EC GPE one can watch the amount of HW events related to
+the EC here (XY -> GPE number from /sys/kernel/debug/ec/*/gpe):
+/sys/firmware/acpi/interrupts/gpeXY
+The io file is binary and a userspace tool located here:
+ftp://ftp.suse.com/pub/people/trenn/sources/ec/
+should get used to read out the 256 Embedded Controller registers
+or writing to them.
+CAUTION: Do not write to the Embedded Controller if you don't know
+what you are doing! Rebooting afterwards also is a good idea.
+This can influence the way your machine is cooled and fans may
+not get switched on again after you did a wrong write.
diff --git a/Documentation/ABI/testing/debugfs-kmemtrace b/Documentation/ABI/testing/debugfs-kmemtrace
deleted file mode 100644
index 5e6a92a02d85..000000000000
--- a/Documentation/ABI/testing/debugfs-kmemtrace
+++ /dev/null
@@ -1,71 +0,0 @@
-What:           /sys/kernel/debug/kmemtrace/
-Date:           July 2008
-Contact:        Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
-Description:
-In kmemtrace-enabled kernels, the following files are created:
-/sys/kernel/debug/kmemtrace/
-        cpu<n>          (0400)  Per-CPU tracing data, see below. (binary)
-        total_overruns  (0400)  Total number of bytes which were dropped from
-                                cpu<n> files because of full buffer condition,
-                                non-binary. (text)
-        abi_version     (0400)  Kernel's kmemtrace ABI version. (text)
-Each per-CPU file should be read according to the relay interface. That is,
-the reader should set affinity to that specific CPU and, as currently done by
-the userspace application (though there are other methods), use poll() with
-an infinite timeout before every read(). Otherwise, erroneous data may be
-read. The binary data has the following _core_ format:
-        Event ID        (1 byte)        Unsigned integer, one of:
-                0 - represents an allocation (KMEMTRACE_EVENT_ALLOC)
-                1 - represents a freeing of previously allocated memory
-                    (KMEMTRACE_EVENT_FREE)
-        Type ID         (1 byte)        Unsigned integer, one of:
-                0 - this is a kmalloc() / kfree()
-                1 - this is a kmem_cache_alloc() / kmem_cache_free()
-                2 - this is a __get_free_pages() et al.
-        Event size      (2 bytes)       Unsigned integer representing the
-                                        size of this event. Used to extend
-                                        kmemtrace. Discard the bytes you
-                                        don't know about.
-        Sequence number (4 bytes)       Signed integer used to reorder data
-                                        logged on SMP machines. Wraparound
-                                        must be taken into account, although
-                                        it is unlikely.
-        Caller address  (8 bytes)       Return address to the caller.
-        Pointer to mem  (8 bytes)       Pointer to target memory area. Can be
-                                        NULL, but not all such calls might be
-                                        recorded.
-In case of KMEMTRACE_EVENT_ALLOC events, the next fields follow:
-        Requested bytes (8 bytes)       Total number of requested bytes,
-                                        unsigned, must not be zero.
-        Allocated bytes (8 bytes)       Total number of actually allocated
-                                        bytes, unsigned, must not be lower
-                                        than requested bytes.
-        Requested flags (4 bytes)       GFP flags supplied by the caller.
-        Target CPU      (4 bytes)       Signed integer, valid for event id 1.
-                                        If equal to -1, target CPU is the same
-                                        as origin CPU, but the reverse might
-                                        not be true.
-The data is made available in the same endianness the machine has.
-Other event ids and type ids may be defined and added. Other fields may be
-added by increasing event size, but see below for details.
-Every modification to the ABI, including new id definitions, are followed
-by bumping the ABI version by one.
-Adding new data to the packet (features) is done at the end of the mandatory
-data:
-        Feature size    (2 byte)
-        Feature ID      (1 byte)
-        Feature data    (Feature size - 3 bytes)
-Users:
-        kmemtrace-user - git://repo.or.cz/kmemtrace-user.git
diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352 b/Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352
new file mode 100644
index 000000000000..feb2e4a87075
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-hm6352
@@ -0,0 +1,21 @@
+Where:          /sys/bus/i2c/devices/.../heading0_input
+Date:           April 2010
+Kernel Version: 2.6.36?
+Contact:        alan.cox@intel.com
+Description:    Reports the current heading from the compass as a floating
+                point value in degrees.
+Where:          /sys/bus/i2c/devices/.../power_state
+Date:           April 2010
+Kernel Version: 2.6.36?
+Contact:        alan.cox@intel.com
+Description:    Sets the power state of the device. 0 sets the device into
+                sleep mode, 1 wakes it up.
+Where:          /sys/bus/i2c/devices/.../calibration
+Date:           April 2010
+Kernel Version: 2.6.36?
+Contact:        alan.cox@intel.com
+Description:    Sets the calibration on or off (1 = on, 0 = off). See the
+                chip data sheet.
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci
index 25be3250f7d6..f979d825d112 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
@@ -139,3 +139,30 @@ Contact:	linux-pci@vger.kernel.org
 Description:
                This symbolic link points to the PCI hotplug controller driver
                module that manages the hotplug slot.
+What:           /sys/bus/pci/devices/.../label
+Date:           July 2010
+Contact:        Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
+Description:
+                Reading this attribute will provide the firmware
+                given name(SMBIOS type 41 string) of the PCI device.
+                The attribute will be created only if the firmware
+                has given a name to the PCI device.
+Users:
+                Userspace applications interested in knowing the
+                firmware assigned name of the PCI device.
+What:           /sys/bus/pci/devices/.../index
+Date:           July 2010
+Contact:        Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
+Description:
+                Reading this attribute will provide the firmware
+                given instance(SMBIOS type 41 device type instance)
+                of the PCI device. The attribute will be created
+                only if the firmware has given a device type instance
+                to the PCI device.
+Users:
+                Userspace applications interested in knowing the
+                firmware assigned device type instance of the PCI
+                device that can help in understanding the firmware
+                intended order of the PCI device.
diff --git a/Documentation/ABI/testing/sysfs-devices-memory b/Documentation/ABI/testing/sysfs-devices-memory
index aba7d989208c..7405de26ee60 100644
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
@@ -7,7 +7,7 @@ Description:
                added or removed dynamically to represent hot-add/remove
                operations.
 Users:          hotplug memory add/remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 What:           /sys/devices/system/memory/memoryX/removable
 Date:           June 2008
@@ -19,7 +19,7 @@ Description:
                identify removable sections of the memory before attempting
                potentially expensive hot-remove memory operation
 Users:          hotplug memory remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils    
 What:           /sys/devices/system/memory/memoryX/phys_device
 Date:           September 2008
@@ -58,7 +58,7 @@ Description:
                by root to offline that section.
                # echo offline > /sys/devices/system/memory/memory22/state
 Users:          hotplug memory remove tools
-                https://w3.opensource.ibm.com/projects/powerpc-utils/
+                http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils
 What:           /sys/devices/system/memoryX/nodeY
diff --git a/Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget b/Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget
index 34034027b13c..d548eaac230a 100644
--- a/Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget
+++ b/Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget
@@ -7,3 +7,15 @@ Description:
                0 -> resumed
                (_UDC_ is the name of the USB Device Controller driver)
+What:           /sys/devices/platform/_UDC_/gadget/gadget-lunX/nofua
+Date:           July 2010
+Contact:        Andy Shevchenko <andy.shevchenko@gmail.com>
+Description:
+                Show or set the reaction on the FUA (Force Unit Access) bit in
+                the SCSI WRITE(10,12) commands when a gadget in USB Mass
+                Storage mode.
+                Possible values are:
+                        1 -> ignore the FUA flag
+                        0 -> obey the FUA flag
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 84a710f87c64..7564e88bfa43 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -197,7 +197,7 @@ Description:	These files exist in every cpu's cache index directories.
                Currently, only AMD Family 10h Processors support cache index
                disable, and only for their L3 caches.  See the BIOS and
                Kernel Developer's Guide at
-                http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
+                http://support.amd.com/us/Embedded_TechDocs/31116-Public-GH-BKDG_3-28_5-28-09.pdf       
                for formatting information and other details on the
                cache index disable.
 Users:    joachim.deguara@amd.com
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
index 88340a23ce91..063bda7fe707 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
@@ -33,19 +33,6 @@ Description:	When read, this file returns the raw integer version number of the
                left. E.g. a returned value of 138 means 1.38
                This file is readonly.
-What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/kone_driver_version
-Date:           March 2010
-Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:    When read, this file returns the driver version.
-                The format of the string is "v<major>.<minor>.<patchlevel>".
-                This attribute is used by the userland tools to find the sysfs-
-                paths of installed kone-mice and determine the capabilites of
-                the driver. Versions of this driver for old kernels replace
-                usbhid instead of generic-usb. The way to scan for this file
-                has been chosen to provide a consistent way for all supported
-                kernel versions.
-                This file is readonly.
 What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/profile[1-5]
 Date:           March 2010
 Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
diff --git a/Documentation/ABI/testing/sysfs-i2c-bmp085 b/Documentation/ABI/testing/sysfs-i2c-bmp085
new file mode 100644
index 000000000000..585962ad0465
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-i2c-bmp085
@@ -0,0 +1,31 @@
+What:           /sys/bus/i2c/devices/<busnum>-<devaddr>/pressure0_input
+Date:           June 2010
+Contact:        Christoph Mair <christoph.mair@gmail.com>
+Description:    Start a pressure measurement and read the result. Values
+                represent the ambient air pressure in pascal (0.01 millibar).
+                Reading: returns the current air pressure.
+What:           /sys/bus/i2c/devices/<busnum>-<devaddr>/temp0_input
+Date:           June 2010
+Contact:        Christoph Mair <christoph.mair@gmail.com>
+Description:    Measure the ambient temperature. The returned value represents
+                the ambient temperature in units of 0.1 degree celsius.
+                Reading: returns the current temperature.
+What:           /sys/bus/i2c/devices/<busnum>-<devaddr>/oversampling
+Date:           June 2010
+Contact:        Christoph Mair <christoph.mair@gmail.com>
+Description:    Tell the bmp085 to use more samples to calculate a pressure
+                value. When writing to this file the chip will use 2^x samples
+                to calculate the next pressure value with x being the value
+                written. Using this feature will decrease RMS noise and
+                increase the measurement time.
+                Reading: returns the current oversampling setting.
+                Writing: sets a new oversampling setting.
+                Accepted values: 0..3.
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index d6a801f45b48..2875f1f74a07 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -114,3 +114,18 @@ Description:
                if this file contains "1", which is the default.  It may be
                disabled by writing "0" to this file, in which case all devices
                will be suspended and resumed synchronously.
+What:           /sys/power/wakeup_count
+Date:           July 2010
+Contact:        Rafael J. Wysocki <rjw@sisk.pl>
+Description:
+                The /sys/power/wakeup_count file allows user space to put the
+                system into a sleep state while taking into account the
+                concurrent arrival of wakeup events.  Reading from it returns
+                the current number of registered wakeup events and it blocks if
+                some wakeup events are being processed at the time the file is
+                read from.  Writing to it will only succeed if the current
+                number of wakeup events is equal to the written value and, if
+                successful, will make the kernel abort a subsequent transition
+                to a sleep state if any wakeup events are reported after the
+                write has returned.
diff --git a/Documentation/Changes b/Documentation/Changes
index eca9f6e6fbe6..4fb88f15f2ef 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -331,7 +331,7 @@ o  <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
 Mkinitrd
 --------
-o  <ftp://rawhide.redhat.com/pub/rawhide/SRPMS/SRPMS/>
+o  <https://code.launchpad.net/initrd-tools/main>
 E2fsprogs
 ---------
@@ -343,11 +343,11 @@ o  <http://jfs.sourceforge.net/>
 Reiserfsprogs
 -------------
-o  <http://www.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.3.tar.gz>
+o  <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>
 Xfsprogs
 --------
-o  <ftp://oss.sgi.com/projects/xfs/download/>
+o  <ftp://oss.sgi.com/projects/xfs/>
 Pcmciautils
 -----------
@@ -387,18 +387,18 @@ o <http://sourceforge.net/projects/fuse>
 mcelog
 ------
-o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/mcelog/>
+o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/>
 Networking
 **********
 PPP
 ---
-o  <ftp://ftp.samba.org/pub/ppp/ppp-2.4.0.tar.gz>
+o  <ftp://ftp.samba.org/pub/ppp/>
 Isdn4k-utils
 ------------
-o  <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils.v3.1pre1.tar.gz>
+o  <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/>
 NFS-utils
 ---------
diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
index 98ce51796f71..d568bc235bc0 100644
--- a/Documentation/DMA-API-HOWTO.txt
+++ b/Documentation/DMA-API-HOWTO.txt
@@ -738,21 +738,31 @@ to "Closing".
   CONFIG_NEED_SG_DMA_LENGTH if the architecture supports IOMMUs
   (including software IOMMU).
-2) ARCH_KMALLOC_MINALIGN
+2) ARCH_DMA_MINALIGN
   Architectures must ensure that kmalloc'ed buffer is
   DMA-safe. Drivers and subsystems depend on it. If an architecture
   isn't fully DMA-coherent (i.e. hardware doesn't ensure that data in
   the CPU cache is identical to data in main memory),
-   ARCH_KMALLOC_MINALIGN must be set so that the memory allocator
+   ARCH_DMA_MINALIGN must be set so that the memory allocator
   makes sure that kmalloc'ed buffer doesn't share a cache line with
   the others. See arch/arm/include/asm/cache.h as an example.
-   Note that ARCH_KMALLOC_MINALIGN is about DMA memory alignment
+   Note that ARCH_DMA_MINALIGN is about DMA memory alignment
   constraints. You don't need to worry about the architecture data
   alignment constraints (e.g. the alignment constraints about 64-bit
   objects).
+3) Supporting multiple types of IOMMUs
+   If your architecture needs to support multiple types of IOMMUs, you
+   can use include/linux/asm-generic/dma-mapping-common.h. It's a
+   library to support the DMA API with multiple types of IOMMUs. Lots
+   of architectures (x86, powerpc, sh, alpha, ia64, microblaze and
+   sparc) use it. Choose one to see how it can be used. If you need to
+   support multiple types of IOMMUs in a single system, the example of
+   x86 or powerpc helps.
                           Closing
 This document, and the API itself, would not be in its current
diff --git a/Documentation/DMA-API.txt b/Documentation/DMA-API.txt
index 05e2ae236865..fe2326906610 100644
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
@@ -456,12 +456,6 @@ be identical to those passed in (and returned by
 dma_alloc_noncoherent()).
 int
-dma_is_consistent(struct device *dev, dma_addr_t dma_handle)
-Returns true if the device dev is performing consistent DMA on the memory
-area pointed to by the dma_handle.
-int
 dma_get_cache_alignment(void)
 Returns the processor cache alignment.  This is the absolute minimum
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index c7e5dc7e8cb3..34929f24c284 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -35,7 +35,7 @@ PS_METHOD	= $(prefer-db2x)
 PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS) xmldoclinks
+xmldocs: $(BOOKS)
 sgmldocs: xmldocs
 PS := $(patsubst %.xml, %.ps, $(BOOKS))
@@ -45,7 +45,7 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
+htmldocs: $(HTML) xmldoclinks
        $(call build_main_index)
        $(call build_images)
@@ -95,7 +95,7 @@ define rule_docproc
        ) > $(dir $@).$(notdir $@).cmd
 endef
-%.xml: %.tmpl FORCE
+%.xml: %.tmpl xmldoclinks FORCE
        $(call if_changed_rule,docproc)
 ###
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 1b2dd4fc3db2..ecd35e9d4410 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -111,6 +111,7 @@ X!Edrivers/base/attribute_container.c
 <!--
 X!Edrivers/base/interface.c
 -->
+!Iinclude/linux/platform_device.h
 !Edrivers/base/platform.c
 !Edrivers/base/bus.c
     </sect1>
diff --git a/Documentation/DocBook/dvb/dvbapi.xml b/Documentation/DocBook/dvb/dvbapi.xml
index 63c528fee624..e3a97fdd62a6 100644
--- a/Documentation/DocBook/dvb/dvbapi.xml
+++ b/Documentation/DocBook/dvb/dvbapi.xml
@@ -12,10 +12,12 @@
 <othername role="mi">O. C.</othername>
 <affiliation><address><email>rjkm@metzlerbros.de</email></address></affiliation>
 </author>
+</authorgroup>
+<authorgroup>
 <author>
 <firstname>Mauro</firstname>
-<surname>Chehab</surname>
 <othername role="mi">Carvalho</othername>
+<surname>Chehab</surname>
 <affiliation><address><email>mchehab@redhat.com</email></address></affiliation>
 <contrib>Ported document to Docbook XML.</contrib>
 </author>
@@ -23,13 +25,24 @@
 <copyright>
        <year>2002</year>
        <year>2003</year>
-        <year>2009</year>
        <holder>Convergence GmbH</holder>
 </copyright>
+<copyright>
+        <year>2009-2010</year>
+        <holder>Mauro Carvalho Chehab</holder>
+</copyright>
 <revhistory>
 <!-- Put document revisions here, newest first. -->
 <revision>
+        <revnumber>2.0.3</revnumber>
+        <date>2010-07-03</date>
+        <authorinitials>mcc</authorinitials>
+        <revremark>
+                Add some frontend capabilities flags, present on kernel, but missing at the specs.
+        </revremark>
+</revision>
+<revision>
        <revnumber>2.0.2</revnumber>
        <date>2009-10-25</date>
        <authorinitials>mcc</authorinitials>
@@ -63,7 +76,7 @@ Added ISDB-T test originally written by Patrick Boettcher
 <title>LINUX DVB API</title>
-<subtitle>Version 3</subtitle>
+<subtitle>Version 5.2</subtitle>
 <!-- ADD THE CHAPTERS HERE -->
  <chapter id="dvb_introdution">
    &sub-intro;
diff --git a/Documentation/DocBook/dvb/frontend.h.xml b/Documentation/DocBook/dvb/frontend.h.xml
index b99644f5340a..d08e0d401418 100644
--- a/Documentation/DocBook/dvb/frontend.h.xml
+++ b/Documentation/DocBook/dvb/frontend.h.xml
@@ -63,6 +63,7 @@ typedef enum fe_caps {
        FE_CAN_8VSB                     = 0x200000,
        FE_CAN_16VSB                    = 0x400000,
        FE_HAS_EXTENDED_CAPS            = 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
+        FE_CAN_TURBO_FEC                = 0x8000000,  /* frontend supports "turbo fec modulation" */
        FE_CAN_2G_MODULATION            = 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
        FE_NEEDS_BENDING                = 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
        FE_CAN_RECOVER                  = 0x40000000, /* frontend can recover from a cable unplug automatically */
diff --git a/Documentation/DocBook/dvb/frontend.xml b/Documentation/DocBook/dvb/frontend.xml
index 300ba1f04177..78d756de5906 100644
--- a/Documentation/DocBook/dvb/frontend.xml
+++ b/Documentation/DocBook/dvb/frontend.xml
@@ -64,8 +64,14 @@ a specific frontend type.</para>
        FE_CAN_BANDWIDTH_AUTO         = 0x40000,
        FE_CAN_GUARD_INTERVAL_AUTO    = 0x80000,
        FE_CAN_HIERARCHY_AUTO         = 0x100000,
-        FE_CAN_MUTE_TS                = 0x80000000,
+        FE_CAN_8VSB                   = 0x200000,
-        FE_CAN_CLEAN_SETUP            = 0x40000000
+        FE_CAN_16VSB                  = 0x400000,
+        FE_HAS_EXTENDED_CAPS          = 0x800000,
+        FE_CAN_TURBO_FEC              = 0x8000000,
+        FE_CAN_2G_MODULATION          = 0x10000000,
+        FE_NEEDS_BENDING              = 0x20000000,
+        FE_CAN_RECOVER                = 0x40000000,
+        FE_CAN_MUTE_TS                = 0x80000000
        } fe_caps_t;
 </programlisting>
 </section>
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 44b3def961a2..a20c6f6fffc3 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -132,7 +132,6 @@ X!Ilib/string.c
     <title>FIFO Buffer</title>
     <sect1><title>kfifo interface</title>
 !Iinclude/linux/kfifo.h
-!Ekernel/kfifo.c
     </sect1>
  </chapter>
diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl
index 55f12ac37acd..490d862c5f0d 100644
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
@@ -199,10 +199,33 @@
   may be configured as a kernel built-in or a kernel loadable module.
   You can only make use of <constant>kgdbwait</constant> and early
   debugging if you build kgdboc into the kernel as a built-in.
+   <para>Optionally you can elect to activate kms (Kernel Mode
+   Setting) integration.  When you use kms with kgdboc and you have a
+   video driver that has atomic mode setting hooks, it is possible to
+   enter the debugger on the graphics console.  When the kernel
+   execution is resumed, the previous graphics mode will be restored.
+   This integration can serve as a useful tool to aid in diagnosing
+   crashes or doing analysis of memory with kdb while allowing the
+   full graphics console applications to run.
+   </para>
   </para>
   <sect2 id="kgdbocArgs">
   <title>kgdboc arguments</title>
-   <para>Usage: <constant>kgdboc=[kbd][[,]serial_device][,baud]</constant></para>
+   <para>Usage: <constant>kgdboc=[kms][[,]kbd][[,]serial_device][,baud]</constant></para>
+   <para>The order listed above must be observed if you use any of the
+   optional configurations together.
+   </para>
+   <para>Abbreviations:
+   <itemizedlist>
+   <listitem><para>kms = Kernel Mode Setting</para></listitem>
+   <listitem><para>kbd = Keyboard</para></listitem>
+   </itemizedlist>
+   </para>
+   <para>You can configure kgdboc to use the keyboard, and or a serial
+   device depending on if you are using kdb and or kgdb, in one of the
+   following scenarios.  The order listed above must be observed if
+   you use any of the optional configurations together.  Using kms +
+   only gdb is generally not a useful combination.</para>
   <sect3 id="kgdbocArgs1">
   <title>Using loadable module or built-in</title>
   <para>
@@ -212,7 +235,7 @@
   <listitem>
   <para>As a kernel loadable module:</para>
   <para>Use the command: <constant>modprobe kgdboc kgdboc=&lt;tty-device&gt;,[baud]</constant></para>
-   <para>Here are two examples of how you might formate the kgdboc
+   <para>Here are two examples of how you might format the kgdboc
   string. The first is for an x86 target using the first serial port.
   The second example is for the ARM Versatile AB using the second
   serial port.
@@ -240,6 +263,9 @@
   </sect3>
   <sect3 id="kgdbocArgs3">
   <title>More examples</title>
+   <para>You can configure kgdboc to use the keyboard, and or a serial
+   device depending on if you are using kdb and or kgdb, in one of the
+   following scenarios.</para>
   <para>You can configure kgdboc to use the keyboard, and or a serial device
   depending on if you are using kdb and or kgdb, in one of the
   following scenarios.
@@ -255,6 +281,12 @@
   <listitem><para>kdb with a keyboard</para>
   <para><constant>kgdboc=kbd</constant></para>
   </listitem>
+   <listitem><para>kdb with kernel mode setting</para>
+   <para><constant>kgdboc=kms,kbd</constant></para>
+   </listitem>
+   <listitem><para>kdb with kernel mode setting and kgdb over a serial port</para>
+   <para><constant>kgdboc=kms,kbd,ttyS0,115200</constant></para>
+   </listitem>
   </orderedlist>
   </para>
   </sect3>
@@ -637,6 +669,8 @@ Task Addr       Pid   Parent [*] cpu State Thread     Command
      <listitem><para>The logic to perform safe memory reads and writes to memory while using the debugger</para></listitem>
      <listitem><para>A full implementation for software breakpoints unless overridden by the arch</para></listitem>
      <listitem><para>The API to invoke either the kdb or kgdb frontend to the debug core.</para></listitem>
+      <listitem><para>The structures and callback API for atomic kernel mode setting.</para>
+      <para>NOTE: kgdboc is where the kms callbacks are invoked.</para></listitem>
      </itemizedlist>
      </para>
      </listitem>
@@ -747,6 +781,8 @@ Task Addr       Pid   Parent [*] cpu State Thread     Command
  </sect1>
  <sect1 id="kgdbocDesign">
  <title>kgdboc internals</title>
+  <sect2>
+  <title>kgdboc and uarts</title>
  <para>
  The kgdboc driver is actually a very thin driver that relies on the
  underlying low level to the hardware driver having "polling hooks"
@@ -754,11 +790,8 @@ Task Addr       Pid   Parent [*] cpu State Thread     Command
  implementation of kgdboc it the serial_core was changed to expose a
  low level UART hook for doing polled mode reading and writing of a
  single character while in an atomic context.  When kgdb makes an I/O
-  request to the debugger, kgdboc invokes a call back in the serial
+  request to the debugger, kgdboc invokes a callback in the serial
-  core which in turn uses the call back in the UART driver.  It is
+  core which in turn uses the callback in the UART driver.</para>
-  certainly possible to extend kgdboc to work with non-UART based
-  consoles in the future.
-  </para>
  <para>
  When using kgdboc with a UART, the UART driver must implement two callbacks in the <constant>struct uart_ops</constant>. Example from drivers/8250.c:<programlisting>
 #ifdef CONFIG_CONSOLE_POLL
@@ -772,9 +805,68 @@ Task Addr       Pid   Parent [*] cpu State Thread     Command
  that they can be called from an atomic context and have to restore
  the state of the UART chip on return such that the system can return
  to normal when the debugger detaches.  You need to be very careful
-  with any kind of lock you consider, because failing here is most
+  with any kind of lock you consider, because failing here is most likely
  going to mean pressing the reset button.
  </para>
+  </sect2>
+  <sect2 id="kgdbocKbd">
+  <title>kgdboc and keyboards</title>
+  <para>The kgdboc driver contains logic to configure communications
+  with an attached keyboard.  The keyboard infrastructure is only
+  compiled into the kernel when CONFIG_KDB_KEYBOARD=y is set in the
+  kernel configuration.</para>
+  <para>The core polled keyboard driver driver for PS/2 type keyboards
+  is in drivers/char/kdb_keyboard.c.  This driver is hooked into the
+  debug core when kgdboc populates the callback in the array
+  called <constant>kdb_poll_funcs[]</constant>.  The
+  kdb_get_kbd_char() is the top-level function which polls hardware
+  for single character input.
+  </para>
+  </sect2>
+  <sect2 id="kgdbocKms">
+  <title>kgdboc and kms</title>
+  <para>The kgdboc driver contains logic to request the graphics
+  display to switch to a text context when you are using
+  "kgdboc=kms,kbd", provided that you have a video driver which has a
+  frame buffer console and atomic kernel mode setting support.</para>
+  <para>
+  Every time the kernel
+  debugger is entered it calls kgdboc_pre_exp_handler() which in turn
+  calls con_debug_enter() in the virtual console layer.  On resuming kernel
+  execution, the kernel debugger calls kgdboc_post_exp_handler() which
+  in turn calls con_debug_leave().</para>
+  <para>Any video driver that wants to be compatible with the kernel
+  debugger and the atomic kms callbacks must implement the
+  mode_set_base_atomic, fb_debug_enter and fb_debug_leave operations.
+  For the fb_debug_enter and fb_debug_leave the option exists to use
+  the generic drm fb helper functions or implement something custom for
+  the hardware.  The following example shows the initialization of the
+  .mode_set_base_atomic operation in
+  drivers/gpu/drm/i915/intel_display.c:
+  <informalexample>
+  <programlisting>
+static const struct drm_crtc_helper_funcs intel_helper_funcs = {
+[...]
+        .mode_set_base_atomic = intel_pipe_set_base_atomic,
+[...]
+};
+  </programlisting>
+  </informalexample>
+  </para>
+  <para>Here is an example of how the i915 driver initializes the fb_debug_enter and fb_debug_leave functions to use the generic drm helpers in
+  drivers/gpu/drm/i915/intel_fb.c:
+  <informalexample>
+  <programlisting>
+static struct fb_ops intelfb_ops = {
+[...]
+       .fb_debug_enter = drm_fb_helper_debug_enter,
+       .fb_debug_leave = drm_fb_helper_debug_leave,
+[...]
+};
+  </programlisting>
+  </informalexample>
+  </para>
+  </sect2>
  </sect1>
  </chapter>
  <chapter id="credits">
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
index 5d4d40f429a5..6ae97157b1c7 100644
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
@@ -218,6 +218,7 @@
 <!ENTITY sub-dev-teletext SYSTEM "v4l/dev-teletext.xml">
 <!ENTITY sub-driver SYSTEM "v4l/driver.xml">
 <!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml">
+<!ENTITY sub-lirc_device_interface SYSTEM "v4l/lirc_device_interface.xml">
 <!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml">
 <!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml">
 <!ENTITY sub-close SYSTEM "v4l/func-close.xml">
diff --git a/Documentation/DocBook/media.tmpl b/Documentation/DocBook/media.tmpl
index eea564bb12cb..f11048d4053f 100644
--- a/Documentation/DocBook/media.tmpl
+++ b/Documentation/DocBook/media.tmpl
@@ -28,7 +28,7 @@
 <title>LINUX MEDIA INFRASTRUCTURE API</title>
 <copyright>
-        <year>2009</year>
+        <year>2009-2010</year>
        <holder>LinuxTV Developers</holder>
 </copyright>
@@ -61,7 +61,7 @@ Foundation. A copy of the license is included in the chapter entitled
                in fact it covers several different video standards including
                DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated
                to documment support also for DVB-S2, ISDB-T and ISDB-S.</para>
-        <para>The third part covers other API's used by all media infrastructure devices</para>
+        <para>The third part covers Remote Controller API</para>
        <para>For additional information and for the latest development code,
                see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>
        <para>For discussing improvements, reporting troubles, sending new drivers, etc, please mail to: <ulink url="http://vger.kernel.org/vger-lists.html#linux-media">Linux Media Mailing List (LMML).</ulink>.</para>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled
 </author>
 </authorgroup>
 <copyright>
-        <year>2009</year>
+        <year>2009-2010</year>
        <holder>Mauro Carvalho Chehab</holder>
 </copyright>
@@ -101,7 +101,7 @@ Foundation. A copy of the license is included in the chapter entitled
 </revhistory>
 </partinfo>
-<title>Other API's used by media infrastructure drivers</title>
+<title>Remote Controller API</title>
 <chapter id="remote_controllers">
 &sub-remote_controllers;
 </chapter>
diff --git a/Documentation/DocBook/scsi.tmpl b/Documentation/DocBook/scsi.tmpl
index d87f4569e768..324b53494f08 100644
--- a/Documentation/DocBook/scsi.tmpl
+++ b/Documentation/DocBook/scsi.tmpl
@@ -393,7 +393,7 @@
        </para>
        <para>
          For documentation see
-          <ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink>
+          <ulink url='http://sg.danny.cz/sg/sdebug26.html'>http://sg.danny.cz/sg/sdebug26.html</ulink>
        </para>
 <!-- !Edrivers/scsi/scsi_debug.c -->
      </sect2>
diff --git a/Documentation/DocBook/stylesheet.xsl b/Documentation/DocBook/stylesheet.xsl
index 254c1d5d2e50..85b25275196f 100644
--- a/Documentation/DocBook/stylesheet.xsl
+++ b/Documentation/DocBook/stylesheet.xsl
@@ -6,4 +6,5 @@
 <param name="callout.graphics">0</param>
 <!-- <param name="paper.type">A4</param> -->
 <param name="generate.section.toc.level">2</param>
+<param name="use.id.as.filename">1</param>
 </stylesheet>
diff --git a/Documentation/DocBook/v4l/compat.xml b/Documentation/DocBook/v4l/compat.xml
index b42b935913cd..54447f0d0784 100644
--- a/Documentation/DocBook/v4l/compat.xml
+++ b/Documentation/DocBook/v4l/compat.xml
@@ -1091,8 +1091,9 @@ signed 64-bit integer. Output devices should not send a buffer out
 until the time in the timestamp field has arrived. I would like to
 follow SGI's lead, and adopt a multimedia timestamping system like
 their UST (Unadjusted System Time). See
-http://reality.sgi.com/cpirazzi_engr/lg/time/intro.html. [This link is
+http://web.archive.org/web/*/http://reality.sgi.com
-no longer valid.] UST uses timestamps that are 64-bit signed integers
+/cpirazzi_engr/lg/time/intro.html. 
+UST uses timestamps that are 64-bit signed integers
 (not struct timeval's) and given in nanosecond units. The UST clock
 starts at zero when the system is booted and runs continuously and
 uniformly. It takes a little over 292 years for UST to overflow. There
diff --git a/Documentation/DocBook/v4l/fdl-appendix.xml b/Documentation/DocBook/v4l/fdl-appendix.xml
index b6ce50dbe492..ae22394ba997 100644
--- a/Documentation/DocBook/v4l/fdl-appendix.xml
+++ b/Documentation/DocBook/v4l/fdl-appendix.xml
@@ -2,7 +2,7 @@
     The GNU Free Documentation License 1.1 in DocBook
     Markup by Eric Baudais <baudais@okstate.edu>
     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
+     http://live.gnome.org/DocumentationProject
     Version: 1.0.1
     Last Modified: Nov 16, 2000
 -->
diff --git a/Documentation/DocBook/v4l/lirc_device_interface.xml b/Documentation/DocBook/v4l/lirc_device_interface.xml
new file mode 100644
index 000000000000..68134c0ab4d1
--- /dev/null
+++ b/Documentation/DocBook/v4l/lirc_device_interface.xml
@@ -0,0 +1,251 @@
+<section id="lirc_dev">
+<title>LIRC Device Interface</title>
+<section id="lirc_dev_intro">
+<title>Introduction</title>
+<para>The LIRC device interface is a bi-directional interface for
+transporting raw IR data between userspace and kernelspace. Fundamentally,
+it is just a chardev (/dev/lircX, for X = 0, 1, 2, ...), with a number
+of standard struct file_operations defined on it. With respect to
+transporting raw IR data to and fro, the essential fops are read, write
+and ioctl.</para>
+<para>Example dmesg output upon a driver registering w/LIRC:</para>
+  <blockquote>
+    <para>$ dmesg |grep lirc_dev</para>
+    <para>lirc_dev: IR Remote Control driver registered, major 248</para>
+    <para>rc rc0: lirc_dev: driver ir-lirc-codec (mceusb) registered at minor = 0</para>
+  </blockquote>
+<para>What you should see for a chardev:</para>
+  <blockquote>
+    <para>$ ls -l /dev/lirc*</para>
+    <para>crw-rw---- 1 root root 248, 0 Jul  2 22:20 /dev/lirc0</para>
+  </blockquote>
+</section>
+<section id="lirc_read">
+<title>LIRC read fop</title>
+<para>The lircd userspace daemon reads raw IR data from the LIRC chardev. The
+exact format of the data depends on what modes a driver supports, and what
+mode has been selected. lircd obtains supported modes and sets the active mode
+via the ioctl interface, detailed at <xref linkend="lirc_ioctl"/>. The generally
+preferred mode is LIRC_MODE_MODE2, in which packets containing an int value
+describing an IR signal are read from the chardev.</para>
+<para>See also <ulink url="http://www.lirc.org/html/technical.html">http://www.lirc.org/html/technical.html</ulink> for more info.</para>
+</section>
+<section id="lirc_write">
+<title>LIRC write fop</title>
+<para>The data written to the chardev is a pulse/space sequence of integer
+values. Pulses and spaces are only marked implicitly by their position. The
+data must start and end with a pulse, therefore, the data must always include
+an unevent number of samples. The write function must block until the data has
+been transmitted by the hardware.</para>
+</section>
+<section id="lirc_ioctl">
+<title>LIRC ioctl fop</title>
+<para>The LIRC device's ioctl definition is bound by the ioctl function
+definition of struct file_operations, leaving us with an unsigned int
+for the ioctl command and an unsigned long for the arg. For the purposes
+of ioctl portability across 32-bit and 64-bit, these values are capped
+to their 32-bit sizes.</para>
+<para>The following ioctls can be used to change specific hardware settings.
+In general each driver should have a default set of settings. The driver
+implementation is expected to re-apply the default settings when the device
+is closed by user-space, so that every application opening the device can rely
+on working with the default settings initially.</para>
+<variablelist>
+  <varlistentry>
+    <term>LIRC_GET_FEATURES</term>
+    <listitem>
+      <para>Obviously, get the underlying hardware device's features. If a driver
+      does not announce support of certain features, calling of the corresponding
+      ioctls is undefined.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_SEND_MODE</term>
+    <listitem>
+      <para>Get supported transmit mode. Only LIRC_MODE_PULSE is supported by lircd.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_REC_MODE</term>
+    <listitem>
+      <para>Get supported receive modes. Only LIRC_MODE_MODE2 and LIRC_MODE_LIRCCODE
+      are supported by lircd.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_SEND_CARRIER</term>
+    <listitem>
+      <para>Get carrier frequency (in Hz) currently used for transmit.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_REC_CARRIER</term>
+    <listitem>
+      <para>Get carrier frequency (in Hz) currently used for IR reception.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_{G,S}ET_{SEND,REC}_DUTY_CYCLE</term>
+    <listitem>
+      <para>Get/set the duty cycle (from 0 to 100) of the carrier signal. Currently,
+      no special meaning is defined for 0 or 100, but this could be used to switch
+      off carrier generation in the future, so these values should be reserved.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_REC_RESOLUTION</term>
+    <listitem>
+      <para>Some receiver have maximum resolution which is defined by internal
+      sample rate or data format limitations. E.g. it's common that signals can
+      only be reported in 50 microsecond steps. This integer value is used by
+      lircd to automatically adjust the aeps tolerance value in the lircd
+      config file.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_M{IN,AX}_TIMEOUT</term>
+    <listitem>
+      <para>Some devices have internal timers that can be used to detect when
+      there's no IR activity for a long time. This can help lircd in detecting
+      that a IR signal is finished and can speed up the decoding process.
+      Returns an integer value with the minimum/maximum timeout that can be
+      set. Some devices have a fixed timeout, in that case both ioctls will
+      return the same value even though the timeout cannot be changed.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_M{IN,AX}_FILTER_{PULSE,SPACE}</term>
+    <listitem>
+      <para>Some devices are able to filter out spikes in the incoming signal
+      using given filter rules. These ioctls return the hardware capabilities
+      that describe the bounds of the possible filters. Filter settings depend
+      on the IR protocols that are expected. lircd derives the settings from
+      all protocols definitions found in its config file.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_GET_LENGTH</term>
+    <listitem>
+      <para>Retrieves the code length in bits (only for LIRC_MODE_LIRCCODE).
+      Reads on the device must be done in blocks matching the bit count.
+      The bit could should be rounded up so that it matches full bytes.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_{SEND,REC}_MODE</term>
+    <listitem>
+      <para>Set send/receive mode. Largely obsolete for send, as only
+      LIRC_MODE_PULSE is supported.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_{SEND,REC}_CARRIER</term>
+    <listitem>
+      <para>Set send/receive carrier (in Hz).</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_TRANSMITTER_MASK</term>
+    <listitem>
+      <para>This enables the given set of transmitters. The first transmitter
+      is encoded by the least significant bit, etc. When an invalid bit mask
+      is given, i.e. a bit is set, even though the device does not have so many
+      transitters, then this ioctl returns the number of available transitters
+      and does nothing otherwise.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_REC_TIMEOUT</term>
+    <listitem>
+      <para>Sets the integer value for IR inactivity timeout (cf.
+      LIRC_GET_MIN_TIMEOUT and LIRC_GET_MAX_TIMEOUT). A value of 0 (if
+      supported by the hardware) disables all hardware timeouts and data should
+      be reported as soon as possible. If the exact value cannot be set, then
+      the next possible value _greater_ than the given value should be set.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_REC_TIMEOUT_REPORTS</term>
+    <listitem>
+      <para>Enable (1) or disable (0) timeout reports in LIRC_MODE_MODE2. By
+      default, timeout reports should be turned off.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_REC_FILTER_{,PULSE,SPACE}</term>
+    <listitem>
+      <para>Pulses/spaces shorter than this are filtered out by hardware. If
+      filters cannot be set independently for pulse/space, the corresponding
+      ioctls must return an error and LIRC_SET_REC_FILTER shall be used instead.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_MEASURE_CARRIER_MODE</term>
+    <listitem>
+      <para>Enable (1)/disable (0) measure mode. If enabled, from the next key
+      press on, the driver will send LIRC_MODE2_FREQUENCY packets. By default
+      this should be turned off.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_REC_{DUTY_CYCLE,CARRIER}_RANGE</term>
+    <listitem>
+      <para>To set a range use LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE
+      with the lower bound first and later LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER
+      with the upper bound.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_NOTIFY_DECODE</term>
+    <listitem>
+      <para>This ioctl is called by lircd whenever a successful decoding of an
+      incoming IR signal could be done. This can be used by supporting hardware
+      to give visual feedback to the user e.g. by flashing a LED.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SETUP_{START,END}</term>
+    <listitem>
+      <para>Setting of several driver parameters can be optimized by encapsulating
+      the according ioctl calls with LIRC_SETUP_START/LIRC_SETUP_END. When a
+      driver receives a LIRC_SETUP_START ioctl it can choose to not commit
+      further setting changes to the hardware until a LIRC_SETUP_END is received.
+      But this is open to the driver implementation and every driver must also
+      handle parameter changes which are not encapsulated by LIRC_SETUP_START
+      and LIRC_SETUP_END. Drivers can also choose to ignore these ioctls.</para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term>LIRC_SET_WIDEBAND_RECEIVER</term>
+    <listitem>
+      <para>Some receivers are equipped with special wide band receiver which is intended
+      to be used to learn output of existing remote.
+      Calling that ioctl with (1) will enable it, and with (0) disable it.
+      This might be useful of receivers that have otherwise narrow band receiver
+      that prevents them to be used with some remotes.
+      Wide band receiver might also be more precise
+      On the other hand its disadvantage it usually reduced range of reception.
+      Note: wide band receiver might be implictly enabled if you enable
+      carrier reports. In that case it will be disabled as soon as you disable
+      carrier reports. Trying to disable wide band receiver while carrier
+      reports are active will do nothing.</para>
+    </listitem>
+  </varlistentry>
+</variablelist>
+</section>
+</section>
diff --git a/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml b/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
index d2dd697a81d8..26e879231088 100644
--- a/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
+++ b/Documentation/DocBook/v4l/pixfmt-packed-rgb.xml
@@ -240,6 +240,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para>
            <entry>r<subscript>1</subscript></entry>
            <entry>r<subscript>0</subscript></entry>
          </row>
+          <row id="V4L2-PIX-FMT-BGR666">
+            <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
+            <entry>'BGRH'</entry>
+            <entry></entry>
+            <entry>b<subscript>5</subscript></entry>
+            <entry>b<subscript>4</subscript></entry>
+            <entry>b<subscript>3</subscript></entry>
+            <entry>b<subscript>2</subscript></entry>
+            <entry>b<subscript>1</subscript></entry>
+            <entry>b<subscript>0</subscript></entry>
+            <entry>g<subscript>5</subscript></entry>
+            <entry>g<subscript>4</subscript></entry>
+            <entry></entry>
+            <entry>g<subscript>3</subscript></entry>
+            <entry>g<subscript>2</subscript></entry>
+            <entry>g<subscript>1</subscript></entry>
+            <entry>g<subscript>0</subscript></entry>
+            <entry>r<subscript>5</subscript></entry>
+            <entry>r<subscript>4</subscript></entry>
+            <entry>r<subscript>3</subscript></entry>
+            <entry>r<subscript>2</subscript></entry>
+            <entry></entry>
+            <entry>r<subscript>1</subscript></entry>
+            <entry>r<subscript>0</subscript></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
          <row id="V4L2-PIX-FMT-BGR24">
            <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
            <entry>'BGR3'</entry>
@@ -700,6 +739,45 @@ defined in error. Drivers may interpret them as in <xref
            <entry>b<subscript>1</subscript></entry>
            <entry>b<subscript>0</subscript></entry>
          </row>
+          <row id="V4L2-PIX-FMT-BGR666">
+            <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
+            <entry>'BGRH'</entry>
+            <entry></entry>
+            <entry>b<subscript>5</subscript></entry>
+            <entry>b<subscript>4</subscript></entry>
+            <entry>b<subscript>3</subscript></entry>
+            <entry>b<subscript>2</subscript></entry>
+            <entry>b<subscript>1</subscript></entry>
+            <entry>b<subscript>0</subscript></entry>
+            <entry>g<subscript>5</subscript></entry>
+            <entry>g<subscript>4</subscript></entry>
+            <entry></entry>
+            <entry>g<subscript>3</subscript></entry>
+            <entry>g<subscript>2</subscript></entry>
+            <entry>g<subscript>1</subscript></entry>
+            <entry>g<subscript>0</subscript></entry>
+            <entry>r<subscript>5</subscript></entry>
+            <entry>r<subscript>4</subscript></entry>
+            <entry>r<subscript>3</subscript></entry>
+            <entry>r<subscript>2</subscript></entry>
+            <entry></entry>
+            <entry>r<subscript>1</subscript></entry>
+            <entry>r<subscript>0</subscript></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
          <row><!-- id="V4L2-PIX-FMT-BGR24" -->
            <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
            <entry>'BGR3'</entry>
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml
index 73f5eab091f4..3c3b667b28e7 100644
--- a/Documentation/DocBook/v4l/remote_controllers.xml
+++ b/Documentation/DocBook/v4l/remote_controllers.xml
@@ -173,3 +173,5 @@ keymapping.</para>
 <para>This program demonstrates how to replace the keymap tables.</para>
 &sub-keytable-c;
 </section>
+&sub-lirc_device_interface;
diff --git a/Documentation/HOWTO b/Documentation/HOWTO
index 40ada93b820a..365bda9a0d94 100644
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
@@ -187,7 +187,7 @@ apply a patch.
 If you do not know where you want to start, but you want to look for
 some task to start doing to join into the kernel development community,
 go to the Linux Kernel Janitor's project:
-        http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors 
 It is a great place to start.  It describes a list of relatively simple
 problems that need to be cleaned up and fixed within the Linux kernel
 source tree.  Working with the developers in charge of this project, you
@@ -315,7 +315,7 @@ process is tracked with the tool patchwork.  Patchwork offers a web
 interface which shows patch postings, any comments on a patch or
 revisions to it, and maintainers can mark patches as under review,
 accepted, or rejected.  Most of these patchwork sites are listed at
-http://patchwork.kernel.org/ or http://patchwork.ozlabs.org/.
+http://patchwork.kernel.org/.
 2.6.x -next kernel tree for integration tests
 ---------------------------------------------
@@ -595,7 +595,7 @@ start exactly where you are now.
 ----------
 Thanks to Paolo Ciarrocchi who allowed the "Development Process"
-(http://linux.tar.bz/articles/2.6-development_process) section
+(http://lwn.net/Articles/94386/) section
 to be based on text he had written, and to Randy Dunlap and Gerrit
 Huizenga for some of the list of things you should and should not say.
 Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,
diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt
index 7f6de6ea5b47..6148d4080f88 100644
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
@@ -581,7 +581,7 @@ to be handled by platform and generic code, not individual drivers.
 8. Vendor and device identifications
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-One is not not required to add new device ids to include/linux/pci_ids.h.
+One is not required to add new device ids to include/linux/pci_ids.h.
 Please add PCI_VENDOR_ID_xxx for vendors and a hex constant for device ids.
 PCI_VENDOR_ID_xxx constants are re-used. The device ids are arbitrary
diff --git a/Documentation/RCU/RTFP.txt b/Documentation/RCU/RTFP.txt
index 5aea459e3dd6..c43460dade0f 100644
--- a/Documentation/RCU/RTFP.txt
+++ b/Documentation/RCU/RTFP.txt
@@ -606,7 +606,7 @@ Suparna Bhattacharya"
 ,Year="2006"
 ,pages="v2 123-138"
 ,note="Available:
-\url{http://www.linuxsymposium.org/2006/view_abstract.php?content_key=184}
+\url{http://www.linuxsymposium.org/2006/index_2006.php}
 \url{http://www.rdrop.com/users/paulmck/RCU/OLSrtRCU.2006.08.11a.pdf}
 [Viewed January 1, 2007]"
 ,annotation="
diff --git a/Documentation/SubmittingDrivers b/Documentation/SubmittingDrivers
index 4947fd8fb182..38d2aab59cac 100644
--- a/Documentation/SubmittingDrivers
+++ b/Documentation/SubmittingDrivers
@@ -161,7 +161,7 @@ How to NOT write kernel driver by Arjan van de Ven:
        http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf
 Kernel Janitor:
-        http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors
 GIT, Fast Version Control System:
        http://git-scm.com/
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 72651f788f4e..689e2371095c 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -98,6 +98,17 @@ system, git, as a "commit log".  See #15, below.
 If your description starts to get long, that's a sign that you probably
 need to split up your patch.  See #3, next.
+When you submit or resubmit a patch or patch series, include the
+complete patch description and justification for it.  Don't just
+say that this is version N of the patch (series).  Don't expect the
+patch merger to refer back to earlier patch versions or referenced
+URLs to find the patch description and put that into the patch.
+I.e., the patch (series) and its description should be self-contained.
+This benefits both the patch merger(s) and reviewers.  Some reviewers
+probably didn't even receive earlier versions of the patch.
+If the patch fixes a logged bug entry, refer to that bug entry by
+number and URL.
 3) Separate your changes.
diff --git a/Documentation/acpi/method-customizing.txt b/Documentation/acpi/method-customizing.txt
index e628cd23ca80..3e1d25aee3fb 100644
--- a/Documentation/acpi/method-customizing.txt
+++ b/Documentation/acpi/method-customizing.txt
@@ -19,6 +19,8 @@ Note: Only ACPI METHOD can be overridden, any other object types like
      "Device", "OperationRegion", are not recognized.
 Note: The same ACPI control method can be overridden for many times,
      and it's always the latest one that used by Linux/kernel.
+Note: To get the ACPI debug object output (Store (AAAA, Debug)),
+      please run "echo 1 > /sys/module/acpi/parameters/aml_debug_output".
 1. override an existing method
   a) get the ACPI table via ACPI sysfs I/F. e.g. to get the DSDT,
diff --git a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt
index 3a4dbe4663c9..b5aada9f20cc 100644
--- a/Documentation/aoe/aoe.txt
+++ b/Documentation/aoe/aoe.txt
@@ -1,6 +1,6 @@
 The EtherDrive (R) HOWTO for users of 2.6 kernels is found at ...
-  http://www.coraid.com/support/linux/EtherDrive-2.6-HOWTO.html
+  http://www.coraid.com/SUPPORT/EtherDrive-HBA  
  It has many tips and hints!
diff --git a/Documentation/apparmor.txt b/Documentation/apparmor.txt
new file mode 100644
index 000000000000..93c1fd7d0635
--- /dev/null
+++ b/Documentation/apparmor.txt
@@ -0,0 +1,39 @@
+--- What is AppArmor? ---
+AppArmor is MAC style security extension for the Linux kernel.  It implements
+a task centered policy, with task "profiles" being created and loaded
+from user space.  Tasks on the system that do not have a profile defined for
+them run in an unconfined state which is equivalent to standard Linux DAC
+permissions.
+--- How to enable/disable ---
+set CONFIG_SECURITY_APPARMOR=y
+If AppArmor should be selected as the default security module then
+   set CONFIG_DEFAULT_SECURITY="apparmor"
+   and CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+Build the kernel
+If AppArmor is not the default security module it can be enabled by passing
+security=apparmor on the kernel's command line.
+If AppArmor is the default security module it can be disabled by passing
+apparmor=0, security=XXXX (where XXX is valid security module), on the
+kernel's command line
+For AppArmor to enforce any restrictions beyond standard Linux DAC permissions
+policy must be loaded into the kernel from user space (see the Documentation
+and tools links).
+--- Documentation ---
+Documentation can be found on the wiki.
+--- Links ---
+Mailing List - apparmor@lists.ubuntu.com
+Wiki - http://apparmor.wiki.kernel.org/
+User space tools - https://launchpad.net/apparmor
+Kernel module - git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
diff --git a/Documentation/arm/IXP2000 b/Documentation/arm/IXP2000
index e0148b6b2c40..68d21d92a30b 100644
--- a/Documentation/arm/IXP2000
+++ b/Documentation/arm/IXP2000
@@ -14,7 +14,7 @@ telecom systems. In addition to an XScale core, it contains up to 8
 interfaces (UTOPIA, SPI, etc), a PCI host bridge, one serial port,
 flash interface, and some other odds and ends. For more information, see:
-http://developer.intel.com/design/network/products/npfamily/ixp2xxx.htm
+http://developer.intel.com
 2. Linux Support
diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx
index 72fbcc4fcab0..133c5fa6c7a1 100644
--- a/Documentation/arm/IXP4xx
+++ b/Documentation/arm/IXP4xx
@@ -45,7 +45,7 @@ require the use of Intel's propietary CSR softare:
 If you need to use any of the above, you need to download Intel's
 software from:
-   http://developer.intel.com/design/network/products/npfamily/ixp425swr1.htm
+   http://developer.intel.com/design/network/products/npfamily/ixp425.htm    
 DO NOT POST QUESTIONS TO THE LINUX MAILING LISTS REGARDING THE PROPIETARY
 SOFTWARE.
@@ -53,7 +53,7 @@ SOFTWARE.
 There are several websites that provide directions/pointers on using
 Intel's software:
-http://ixp4xx-osdg.sourceforge.net/ 
+   http://sourceforge.net/projects/ixp4xx-osdg/
   Open Source Developer's Guide for using uClinux and the Intel libraries 
 http://gatewaymaker.sourceforge.net/ 
@@ -112,21 +112,21 @@ http://www.adiengineering.com/productsCoyote.html
   Finally, there is an IDE port hanging off the expansion bus.
 Gateworks Avila Network Platform
-http://www.gateworks.com/avila_sbc.htm
+http://www.gateworks.com/support/overview.php
   The Avila platform is basically and IXDP425 with the 4 PCI slots
   replaced with mini-PCI slots and a CF IDE interface hanging off
   the expansion bus.
 Intel IXDP425 Development Platform
-http://developer.intel.com/design/network/products/npfamily/ixdp425.htm
+http://www.intel.com/design/network/products/npfamily/ixdpg425.htm  
   This is Intel's standard reference platform for the IXDP425 and is 
   also known as the Richfield board. It contains 4 PCI slots, 16MB
   of flash, two 10/100 ports and one ADSL port.
 Intel IXDP465 Development Platform
-http://developer.intel.com/design/network/products/npfamily/ixdp465.htm
+http://www.intel.com/design/network/products/npfamily/ixdp465.htm
   This is basically an IXDP425 with an IXP465 and 32M of flash instead
   of just 16.
@@ -141,15 +141,13 @@ Intel IXDPG425 Development Platform
   a pivot_root to NFS.
 Motorola PrPMC1100 Processor Mezanine Card
-http://www.fountainsys.com/datasheet/PrPMC1100.pdf
+http://www.fountainsys.com
   The PrPMC1100 is based on the IXCP1100 and is meant to plug into
   and IXP2400/2800 system to act as the system controller. It simply
   contains a CPU and 16MB of flash on the board and needs to be
   plugged into a carrier board to function. Currently Linux only
   supports the Motorola PrPMC carrier board for this platform.
-   See https://mcg.motorola.com/us/ds/pdf/ds0144.pdf for info
-   on the carrier board.
 5. TODO LIST
diff --git a/Documentation/arm/README b/Documentation/arm/README
index d98783fbe0c7..aea34095cdcf 100644
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
@@ -41,12 +41,12 @@ Bug reports etc
 ---------------
  Please send patches to the patch system.  For more information, see
-  http://www.arm.linux.org.uk/patches/info.html  Always include some
+  http://www.arm.linux.org.uk/developer/patches/info.php Always include some
  explanation as to what the patch does and why it is needed.
  Bug reports should be sent to linux-arm-kernel@lists.arm.linux.org.uk,
  or submitted through the web form at
-  http://www.arm.linux.org.uk/forms/solution.shtml
+  http://www.arm.linux.org.uk/developer/ 
  When sending bug reports, please ensure that they contain all relevant
  information, eg. the kernel messages that were printed before/during
diff --git a/Documentation/arm/SA1100/Assabet b/Documentation/arm/SA1100/Assabet
index 91f7ce7ba426..08b885d35674 100644
--- a/Documentation/arm/SA1100/Assabet
+++ b/Documentation/arm/SA1100/Assabet
@@ -2,8 +2,7 @@ The Intel Assabet (SA-1110 evaluation) board
 ============================================
 Please see:
-http://developer.intel.com/design/strong/quicklist/eval-plat/sa-1110.htm
+http://developer.intel.com
-http://developer.intel.com/design/strong/guides/278278.htm
 Also some notes from John G Dorsey <jd5q@andrew.cmu.edu>:
 http://www.cs.cmu.edu/~wearable/software/assabet.html
@@ -64,7 +63,7 @@ Initial RedBoot configuration
 -----------------------------
 The commands used here are explained in The RedBoot User's Guide available
-on-line at http://sources.redhat.com/ecos/docs-latest/redboot/redboot.html.
+on-line at http://sources.redhat.com/ecos/docs.html.
 Please refer to it for explanations.
 If you have a CF network card (my Assabet kit contained a CF+ LP-E from
diff --git a/Documentation/arm/SA1100/Brutus b/Documentation/arm/SA1100/Brutus
index b1cfd405dccc..6a3aa95e9bfd 100644
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
@@ -1,7 +1,7 @@
 Brutus is an evaluation platform for the SA1100 manufactured by Intel.  
 For more details, see:
-http://developer.intel.com/design/strong/applnots/sa1100lx/getstart.htm
+http://developer.intel.com
 To compile for Brutus, you must issue the following commands:
diff --git a/Documentation/arm/SA1100/FreeBird b/Documentation/arm/SA1100/FreeBird
index eda28b3232e7..fb23b770aaf4 100644
--- a/Documentation/arm/SA1100/FreeBird
+++ b/Documentation/arm/SA1100/FreeBird
@@ -1,5 +1,5 @@
 Freebird-1.1 is produced by Legned(C) ,Inc.
-(http://www.legend.com.cn)
+http://web.archive.org/web/*/http://www.legend.com.cn
 and software/linux mainatined by Coventive(C),Inc.
 (http://www.coventive.com)
diff --git a/Documentation/arm/SA1100/GraphicsClient b/Documentation/arm/SA1100/GraphicsClient
index 6c9c4f5a36e1..867bb35943af 100644
--- a/Documentation/arm/SA1100/GraphicsClient
+++ b/Documentation/arm/SA1100/GraphicsClient
@@ -71,7 +71,7 @@ Supported peripherals:
 - serial ports (ttyS[0-2])
  - ttyS0 is default for serial console
 - Smart I/O (ADC, keypad, digital inputs, etc)
-  See http://www.applieddata.com/developers/linux for IOCTL documentation
+  See http://www.eurotech-inc.com/linux-sbc.asp for IOCTL documentation
  and example user space code. ps/2 keybd is multiplexed through this driver
 To do:
diff --git a/Documentation/arm/SA1100/GraphicsMaster b/Documentation/arm/SA1100/GraphicsMaster
index ee7c6595f23f..9145088a0ba2 100644
--- a/Documentation/arm/SA1100/GraphicsMaster
+++ b/Documentation/arm/SA1100/GraphicsMaster
@@ -28,7 +28,7 @@ Supported peripherals:
 - serial ports (ttyS[0-2])
  - ttyS0 is default for serial console
 - Smart I/O (ADC, keypad, digital inputs, etc)
-  See http://www.applieddata.com/developers/linux for IOCTL documentation
+  See http://www.eurotech-inc.com/linux-sbc.asp for IOCTL documentation
  and example user space code. ps/2 keybd is multiplexed through this driver
 To do:
diff --git a/Documentation/arm/SA1100/Itsy b/Documentation/arm/SA1100/Itsy
index 3b594534323b..44b94997fa0d 100644
--- a/Documentation/arm/SA1100/Itsy
+++ b/Documentation/arm/SA1100/Itsy
@@ -4,7 +4,7 @@ research projects at Compaq that are related to pocket computing.
 For more information, see:
-        http://www.research.digital.com/wrl/itsy/index.html
+        http://www.hpl.hp.com/downloads/crl/itsy/
 Notes on initial 2.4 Itsy support (8/27/2000) :
 The port was done on an Itsy version 1.5 machine with a daughtercard with
diff --git a/Documentation/arm/SA1100/PLEB b/Documentation/arm/SA1100/PLEB
index 92cae066908d..b9c8a631a351 100644
--- a/Documentation/arm/SA1100/PLEB
+++ b/Documentation/arm/SA1100/PLEB
@@ -6,6 +6,6 @@ PLEB support has yet to be fully integrated.
 For more information, see:
-        http://www.cse.unsw.edu.au/~pleb/
+        http://www.cse.unsw.edu.au
diff --git a/Documentation/arm/SA1100/Victor b/Documentation/arm/SA1100/Victor
index f938a29fdc20..9cff415da5a7 100644
--- a/Documentation/arm/SA1100/Victor
+++ b/Documentation/arm/SA1100/Victor
@@ -3,7 +3,7 @@ VisuAide, Inc. to be used by blind people.
 For more information related to Victor, see:
-        http://www.visuaide.com/victor
+        http://www.humanware.com/en-usa/products
 Of course Victor is using Linux as its main operating system.
 The Victor implementation for Linux is maintained by Nicolas Pitre:
diff --git a/Documentation/arm/SA1100/nanoEngine b/Documentation/arm/SA1100/nanoEngine
index fc431cbfefc2..48a7934f95f6 100644
--- a/Documentation/arm/SA1100/nanoEngine
+++ b/Documentation/arm/SA1100/nanoEngine
@@ -7,5 +7,5 @@ for more info.
 (Ref: Stuart Adams <sja@brightstareng.com>)
 Also visit Larry Doolittle's "Linux for the nanoEngine" site:
-http://recycle.lbl.gov/~ldoolitt/bse/
+http://www.brightstareng.com/arm/nanoeng.htm
diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index eb0fae18ffb1..771d48d3b335 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -33,7 +33,13 @@ ffff0000	ffff0fff	CPU vector page.
 fffe0000        fffeffff        XScale cache flush area.  This is used
                                in proc-xscale.S to flush the whole data
-                                cache.  Free for other usage on non-XScale.
+                                cache. (XScale does not have TCM.)
+fffe8000        fffeffff        DTCM mapping area for platforms with
+                                DTCM mounted inside the CPU.
+fffe0000        fffe7fff        ITCM mapping area for platforms with
+                                ITCM mounted inside the CPU.
 fff00000        fffdffff        Fixmap mapping region.  Addresses provided
                                by fix_to_virt() will be located here.
diff --git a/Documentation/arm/tcm.txt b/Documentation/arm/tcm.txt
index 77fd9376e6d7..7c15871c1885 100644
--- a/Documentation/arm/tcm.txt
+++ b/Documentation/arm/tcm.txt
@@ -19,8 +19,8 @@ defines a CPUID_TCM register that you can read out from the
 system control coprocessor. Documentation from ARM can be found
 at http://infocenter.arm.com, search for "TCM Status Register"
 to see documents for all CPUs. Reading this register you can
-determine if ITCM (bit 0) and/or DTCM (bit 16) is present in the
+determine if ITCM (bits 1-0) and/or DTCM (bit 17-16) is present
-machine.
+in the machine.
 There is further a TCM region register (search for "TCM Region
 Registers" at the ARM site) that can report and modify the location
@@ -35,7 +35,15 @@ The TCM memory can then be remapped to another address again using
 the MMU, but notice that the TCM if often used in situations where
 the MMU is turned off. To avoid confusion the current Linux
 implementation will map the TCM 1 to 1 from physical to virtual
-memory in the location specified by the machine.
+memory in the location specified by the kernel. Currently Linux
+will map ITCM to 0xfffe0000 and on, and DTCM to 0xfffe8000 and
+on, supporting a maximum of 32KiB of ITCM and 32KiB of DTCM.
+Newer versions of the region registers also support dividing these
+TCMs in two separate banks, so for example an 8KiB ITCM is divided
+into two 4KiB banks with its own control registers. The idea is to
+be able to lock and hide one of the banks for use by the secure
+world (TrustZone).
 TCM is used for a few things:
@@ -65,18 +73,18 @@ in <asm/tcm.h>. Using this interface it is possible to:
  memory. Such a heap is great for things like saving
  device state when shutting off device power domains.
-A machine that has TCM memory shall select HAVE_TCM in
+A machine that has TCM memory shall select HAVE_TCM from
-arch/arm/Kconfig for itself, and then the
+arch/arm/Kconfig for itself. Code that needs to use TCM shall
-rest of the functionality will depend on the physical
+#include <asm/tcm.h>
-location and size of ITCM and DTCM to be defined in
-mach/memory.h for the machine. Code that needs to use
-TCM shall #include <asm/tcm.h> If the TCM is not located
-at the place given in memory.h it will be moved using
-the TCM Region registers.
 Functions to go into itcm can be tagged like this:
 int __tcmfunc foo(int bar);
+Since these are marked to become long_calls and you may want
+to have functions called locally inside the TCM without
+wasting space, there is also the __tcmlocalfunc prefix that
+will make the call relative.
 Variables to go into dtcm can be tagged like this:
 int __tcmdata foo;
diff --git a/Documentation/binfmt_misc.txt b/Documentation/binfmt_misc.txt
index f609ebf9c78f..c1ed6948ba80 100644
--- a/Documentation/binfmt_misc.txt
+++ b/Documentation/binfmt_misc.txt
@@ -111,6 +111,6 @@ cause unexpected behaviour and can be a security hazard.
 There is a web page about binfmt_misc at
-http://www.tat.physik.uni-tuebingen.de/~rguenth/linux/binfmt_misc.html
+http://www.tat.physik.uni-tuebingen.de
 Richard Günther <rguenth@tat.physik.uni-tuebingen.de>
diff --git a/Documentation/blackfin/00-INDEX b/Documentation/blackfin/00-INDEX
index c34e12440fec..2df0365f2dff 100644
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
@@ -1,11 +1,8 @@
 00-INDEX
        - This file
-cachefeatures.txt
+bfin-gpio-notes.txt
-        - Supported cache features.
-Filesystems
-        - Requirements for mounting the root file system.
-bfin-gpio-note.txt
        - Notes in developing/using bfin-gpio driver.
+bfin-spi-notes.txt
+        - Notes for using bfin spi bus driver.
diff --git a/Documentation/blackfin/Filesystems b/Documentation/blackfin/Filesystems
deleted file mode 100644
index 51260a1b8032..000000000000
--- a/Documentation/blackfin/Filesystems
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * File:         Documentation/blackfin/Filesystems
- * Based on:
- * Author:
- *
- * Created:
- * Description:  This file contains the simple DMA Implementation for Blackfin
- *
- * Rev:          $Id: Filesystems 2384 2006-11-01 04:12:43Z magicyang $
- *
- * Modified:
- *               Copyright 2004-2006 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- */
-                How to mount the root file system in uClinux/Blackfin
-                -----------------------------------------------------
-1       Mounting EXT3 File system.
-        ------------------------
-        Creating an EXT3 File system for uClinux/Blackfin:
-Please follow the steps to form the EXT3 File system and mount the same as root
-file system.
-a       Make an ext3 file system as large as you want the final root file
-        system.
-                mkfs.ext3  /dev/ram0 <your-rootfs-size-in-1k-blocks>
-b       Mount this Empty file system on a free directory as:
-                mount -t ext3 /dev/ram0  ./test
-                        where ./test is the empty directory.
-c       Copy your root fs directory that you have so carefully made over.
-                cp -af  /tmp/my_final_rootfs_files/* ./test
-                (For ex: cp -af uClinux-dist/romfs/* ./test)
-d       If you have done everything right till now you should be able to see
-        the required "root" dir's (that's etc, root, bin, lib, sbin...)
-e       Now unmount the file system
-                umount  ./test
-f       Create the root file system image.
-                dd if=/dev/ram0 bs=1k count=<your-rootfs-size-in-1k-blocks> \
-                > ext3fs.img
-Now you have to tell the kernel that will be mounting this file system as
-rootfs.
-So do a make menuconfig under kernel and select the Ext3 journaling file system
-support under File system --> submenu.
-2.      Mounting EXT2 File system.
-        -------------------------
-By default the ext2 file system image will be created if you invoke make from
-the top uClinux-dist directory.
-3.      Mounting CRAMFS File System
-        ----------------------------
-To create a CRAMFS file system image execute the command
-        mkfs.cramfs ./test cramfs.img
-        where ./test is the target directory.
-4.      Mounting ROMFS File System
-        --------------------------
-To create a ROMFS file system image execute the command
-        genromfs -v -V "ROMdisk" -f romfs.img -d ./test
-        where ./test is the target directory
-5.      Mounting the JFFS2 Filesystem
-        -----------------------------
-To create a compressed JFFS filesystem (JFFS2), please execute the command
-        mkfs.jffs2 -d ./test -o jffs2.img
-        where ./test is the target directory.
-However, please make sure the following is in your kernel config.
-/*
- * RAM/ROM/Flash chip drivers
- */
-#define CONFIG_MTD_CFI 1
-#define CONFIG_MTD_ROM 1
-/*
- * Mapping drivers for chip access
- */
-#define CONFIG_MTD_COMPLEX_MAPPINGS 1
-#define CONFIG_MTD_BF533 1
-#undef CONFIG_MTD_UCLINUX
-Through the u-boot boot loader, use the jffs2.img in the corresponding
-partition made in linux-2.6.x/drivers/mtd/maps/bf533_flash.c.
-NOTE -  Currently the Flash driver is available only for EZKIT. Watch out for a
-        STAMP driver soon.
-6.      Mounting the NFS File system
-        -----------------------------
-        For mounting the NFS please do the following in the kernel config.
-        In Networking Support --> Networking options --> TCP/IP networking -->
-                IP: kernel level autoconfiguration
-        Enable BOOTP Support.
-        In Kernel hacking --> Compiled-in kernel boot parameter add the following
-                root=/dev/nfs rw ip=bootp
-        In File system --> Network File system, Enable
-                NFS file system support --> NFSv3 client support
-                Root File system on NFS
-        in uClibc menuconfig, do the following
-        In Networking Support
-                enable Remote Procedure Call (RPC) support
-                        Full RPC Support
-        On the Host side, ensure that /etc/dhcpd.conf looks something like this
-                ddns-update-style ad-hoc;
-                allow bootp;
-                subnet 10.100.4.0 netmask 255.255.255.0 {
-                default-lease-time 122209600;
-                max-lease-time 31557600;
-                group {
-                        host bf533 {
-                                hardware ethernet 00:CF:52:49:C3:01;
-                                fixed-address 10.100.4.50;
-                                option root-path "/home/nfsmount";
-                        }
-                }
-        ensure that /etc/exports looks something like this
-                /home/nfsmount *(rw,no_root_squash,no_all_squash)
-         run the following commands as root (may differ depending on your
-         distribution) :
-                -  service nfs start
-                -  service portmap start
-                -  service dhcpd start
-                -  /usr/sbin/exportfs
diff --git a/Documentation/blackfin/bfin-spi-notes.txt b/Documentation/blackfin/bfin-spi-notes.txt
new file mode 100644
index 000000000000..556fa877f2e8
--- /dev/null
+++ b/Documentation/blackfin/bfin-spi-notes.txt
@@ -0,0 +1,14 @@
+SPI Chip Select behavior:
+With the Blackfin on-chip SPI peripheral, there is some logic tied to the CPHA
+bit whether the Slave Select Line is controlled by hardware (CPHA=0) or
+controlled by software (CPHA=1). However, the Linux SPI bus driver assumes that
+the Slave Select is always under software control and being asserted during
+the entire SPI transfer. - And not just bits_per_word duration.
+In most cases you can utilize SPI MODE_3 instead of MODE_0 to work-around this
+behavior. If your SPI slave device in question requires SPI MODE_0 or MODE_2
+timing, you can utilize the GPIO controlled SPI Slave Select option instead.
+You can even use the same pin whose peripheral role is a SSEL,
+but use it as a GPIO instead.
diff --git a/Documentation/blackfin/cachefeatures.txt b/Documentation/blackfin/cachefeatures.txt
deleted file mode 100644
index 75de51f94515..000000000000
--- a/Documentation/blackfin/cachefeatures.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * File:         Documentation/blackfin/cachefeatures.txt
- * Based on:
- * Author:
- *
- * Created:
- * Description:  This file contains the simple DMA Implementation for Blackfin
- *
- * Rev:          $Id: cachefeatures.txt 2384 2006-11-01 04:12:43Z magicyang $
- *
- * Modified:
- *               Copyright 2004-2006 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- */
-        - Instruction and Data cache initialization.
-                icache_init();
-                dcache_init();
-        -  Instruction and Data cache Invalidation Routines, when flushing the
-           same is not required.
-                _icache_invalidate();
-                _dcache_invalidate();
-        Also, for invalidating the entire instruction and data cache, the below
-        routines are provided (another method for invalidation, refer page no 267 and 287 of
-        ADSP-BF533 Hardware Reference manual)
-                invalidate_entire_dcache();
-                invalidate_entire_icache();
-        -External Flushing of Instruction and data cache routines.
-                flush_instruction_cache();
-                flush_data_cache();
-        - Internal Flushing of Instruction and Data Cache.
-                icplb_flush();
-                dcplb_flush();
-        - Miscellaneous cache functions.
-                flush_cache_all();
-                flush_cache_mm();
-                invalidate_dcache_range();
-                flush_dcache_range();
-                flush_dcache_page();
-                flush_cache_range();
-                flush_cache_page();
-                invalidate_dcache_range();
-                flush_page_to_ram();
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 508b5b2b0289..b9a83dd24732 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -7,7 +7,7 @@ Notes Written on Jan 15, 2002:
 Last Updated May 2, 2002
 September 2003: Updated I/O Scheduler portions
-        Nick Piggin <piggin@cyberone.com.au>
+        Nick Piggin <npiggin@kernel.dk>
 Introduction:
diff --git a/Documentation/blockdev/paride.txt b/Documentation/blockdev/paride.txt
index e4312676bdda..ee6717e3771d 100644
--- a/Documentation/blockdev/paride.txt
+++ b/Documentation/blockdev/paride.txt
@@ -412,6 +412,6 @@ have in your mail headers, when sending mail to the list server.
 You might also find some useful information on the linux-parport
 web pages (although they are not always up to date) at
-        http://www.torque.net/parport/
+        http://web.archive.org/web/*/http://www.torque.net/parport/
diff --git a/Documentation/cdrom/packet-writing.txt b/Documentation/cdrom/packet-writing.txt
index 1c407778c8b2..13c251d5add6 100644
--- a/Documentation/cdrom/packet-writing.txt
+++ b/Documentation/cdrom/packet-writing.txt
@@ -95,7 +95,7 @@ Using the pktcdvd sysfs interface
 Since Linux 2.6.20, the pktcdvd module has a sysfs interface
 and can be controlled by it. For example the "pktcdvd" tool uses
-this interface. (see http://people.freenet.de/BalaGi#pktcdvd )
+this interface. (see http://tom.ist-im-web.de/download/pktcdvd )
 "pktcdvd" works similar to "pktsetup", e.g.:
diff --git a/Documentation/cgroups/cpusets.txt b/Documentation/cgroups/cpusets.txt
index 51682ab2dd1a..5d0d5692a365 100644
--- a/Documentation/cgroups/cpusets.txt
+++ b/Documentation/cgroups/cpusets.txt
@@ -691,7 +691,7 @@ There are ways to query or modify cpusets:
   cat, rmdir commands from the shell, or their equivalent from C.
 - via the C library libcpuset.
 - via the C library libcgroup.
-   (http://sourceforge.net/proects/libcg/)
+   (http://sourceforge.net/projects/libcg/)
 - via the python application cset.
   (http://developer.novell.com/wiki/index.php/Cpuset)
diff --git a/Documentation/coccinelle.txt b/Documentation/coccinelle.txt
new file mode 100644
index 000000000000..cd2b02837066
--- /dev/null
+++ b/Documentation/coccinelle.txt
@@ -0,0 +1,258 @@
+Copyright 2010 Nicolas Palix <npalix@diku.dk>
+Copyright 2010 Julia Lawall <julia@diku.dk>
+Copyright 2010 Gilles Muller <Gilles.Muller@lip6.fr>
+ Getting Coccinelle
+~~~~~~~~~~~~~~~~~~~~
+The semantic patches included in the kernel use the 'virtual rule'
+feature which was introduced in Coccinelle version 0.1.11.
+Coccinelle (>=0.2.0) is available through the package manager
+of many distributions, e.g. :
+ - Debian (>=squeeze)
+ - Fedora (>=13)
+ - Ubuntu (>=10.04 Lucid Lynx)
+ - OpenSUSE
+ - Arch Linux
+ - NetBSD
+ - FreeBSD
+You can get the latest version released from the Coccinelle homepage at
+http://coccinelle.lip6.fr/
+Once you have it, run the following command:
+        ./configure
+        make
+as a regular user, and install it with
+        sudo make install
+ Using Coccinelle on the Linux kernel
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+A Coccinelle-specific target is defined in the top level
+Makefile. This target is named 'coccicheck' and calls the 'coccicheck'
+front-end in the 'scripts' directory.
+Four modes are defined: report, patch, context, and org. The mode to
+use is specified by setting the MODE variable with 'MODE=<mode>'.
+'report' generates a list in the following format:
+  file:line:column-column: message
+'patch' proposes a fix, when possible.
+'context' highlights lines of interest and their context in a
+diff-like style.Lines of interest are indicated with '-'.
+'org' generates a report in the Org mode format of Emacs.
+Note that not all semantic patches implement all modes.
+To make a report for every semantic patch, run the following command:
+        make coccicheck MODE=report
+NB: The 'report' mode is the default one.
+To produce patches, run:
+        make coccicheck MODE=patch
+The coccicheck target applies every semantic patch available in the
+subdirectories of 'scripts/coccinelle' to the entire Linux kernel.
+For each semantic patch, a changelog message is proposed.  It gives a
+description of the problem being checked by the semantic patch, and
+includes a reference to Coccinelle.
+As any static code analyzer, Coccinelle produces false
+positives. Thus, reports must be carefully checked, and patches
+reviewed.
+ Using Coccinelle with a single semantic patch
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The optional make variable COCCI can be used to check a single
+semantic patch. In that case, the variable must be initialized with
+the name of the semantic patch to apply.
+For instance:
+        make coccicheck COCCI=<my_SP.cocci> MODE=patch
+or
+        make coccicheck COCCI=<my_SP.cocci> MODE=report
+ Proposing new semantic patches
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+New semantic patches can be proposed and submitted by kernel
+developers. For sake of clarity, they should be organized in the
+subdirectories of 'scripts/coccinelle/'.
+ Detailed description of the 'report' mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+'report' generates a list in the following format:
+  file:line:column-column: message
+Example:
+Running
+        make coccicheck MODE=report COCCI=scripts/coccinelle/err_cast.cocci
+will execute the following part of the SmPL script.
+<smpl>
+@r depends on !context && !patch && (org || report)@
+expression x;
+position p;
+@@
+ ERR_PTR@p(PTR_ERR(x))
+@script:python depends on report@
+p << r.p;
+x << r.x;
+@@
+msg="ERR_CAST can be used with %s" % (x)
+coccilib.report.print_report(p[0], msg)
+</smpl>
+This SmPL excerpt generates entries on the standard output, as
+illustrated below:
+/home/user/linux/crypto/ctr.c:188:9-16: ERR_CAST can be used with alg
+/home/user/linux/crypto/authenc.c:619:9-16: ERR_CAST can be used with auth
+/home/user/linux/crypto/xts.c:227:9-16: ERR_CAST can be used with alg
+ Detailed description of the 'patch' mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When the 'patch' mode is available, it proposes a fix for each problem
+identified.
+Example:
+Running
+        make coccicheck MODE=patch COCCI=scripts/coccinelle/err_cast.cocci
+will execute the following part of the SmPL script.
+<smpl>
+@ depends on !context && patch && !org && !report @
+expression x;
+@@
+- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
+</smpl>
+This SmPL excerpt generates patch hunks on the standard output, as
+illustrated below:
+diff -u -p a/crypto/ctr.c b/crypto/ctr.c
+--- a/crypto/ctr.c 2010-05-26 10:49:38.000000000 +0200
+++ b/crypto/ctr.c 2010-06-03 23:44:49.000000000 +0200
+@@ -185,7 +185,7 @@ static struct crypto_instance *crypto_ct
+        alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,
+                                  CRYPTO_ALG_TYPE_MASK);
+        if (IS_ERR(alg))
+-               return ERR_PTR(PTR_ERR(alg));
+               return ERR_CAST(alg);
+ 
+        /* Block size must be >= 4 bytes. */
+        err = -EINVAL;
+ Detailed description of the 'context' mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+'context' highlights lines of interest and their context
+in a diff-like style.
+NOTE: The diff-like output generated is NOT an applicable patch. The
+      intent of the 'context' mode is to highlight the important lines
+      (annotated with minus, '-') and gives some surrounding context
+      lines around. This output can be used with the diff mode of
+      Emacs to review the code.
+Example:
+Running
+        make coccicheck MODE=context COCCI=scripts/coccinelle/err_cast.cocci
+will execute the following part of the SmPL script.
+<smpl>
+@ depends on context && !patch && !org && !report@
+expression x;
+@@
+* ERR_PTR(PTR_ERR(x))
+</smpl>
+This SmPL excerpt generates diff hunks on the standard output, as
+illustrated below:
+diff -u -p /home/user/linux/crypto/ctr.c /tmp/nothing
+--- /home/user/linux/crypto/ctr.c       2010-05-26 10:49:38.000000000 +0200
+++ /tmp/nothing
+@@ -185,7 +185,6 @@ static struct crypto_instance *crypto_ct
+        alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,
+                                  CRYPTO_ALG_TYPE_MASK);
+        if (IS_ERR(alg))
+-               return ERR_PTR(PTR_ERR(alg));
+ 
+        /* Block size must be >= 4 bytes. */
+        err = -EINVAL;
+ Detailed description of the 'org' mode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+'org' generates a report in the Org mode format of Emacs.
+Example:
+Running
+        make coccicheck MODE=org COCCI=scripts/coccinelle/err_cast.cocci
+will execute the following part of the SmPL script.
+<smpl>
+@r depends on !context && !patch && (org || report)@
+expression x;
+position p;
+@@
+ ERR_PTR@p(PTR_ERR(x))
+@script:python depends on org@
+p << r.p;
+x << r.x;
+@@
+msg="ERR_CAST can be used with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+</smpl>
+This SmPL excerpt generates Org entries on the standard output, as
+illustrated below:
+* TODO [[view:/home/user/linux/crypto/ctr.c::face=ovl-face1::linb=188::colb=9::cole=16][ERR_CAST can be used with alg]]
+* TODO [[view:/home/user/linux/crypto/authenc.c::face=ovl-face1::linb=619::colb=9::cole=16][ERR_CAST can be used with auth]]
+* TODO [[view:/home/user/linux/crypto/xts.c::face=ovl-face1::linb=227::colb=9::cole=16][ERR_CAST can be used with alg]]
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index a99d7031cdf9..45d5a217484f 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -2,7 +2,7 @@
                Maintainers:
                CPU Hotplug Core:
-                        Rusty Russell <rusty@rustycorp.com.au>
+                        Rusty Russell <rusty@rustcorp.com.au>
                        Srivatsa Vaddagiri <vatsa@in.ibm.com>
                i386:
                        Zwane Mwaikambo <zwane@arm.linux.org.uk>
diff --git a/Documentation/development-process/4.Coding b/Documentation/development-process/4.Coding
index a5a3450faaa0..2278693c8ffa 100644
--- a/Documentation/development-process/4.Coding
+++ b/Documentation/development-process/4.Coding
@@ -281,7 +281,7 @@ With sparse, the programmer can be warned about confusion between
 user-space and kernel-space addresses, mixture of big-endian and
 small-endian quantities, the passing of integer values where a set of bit
 flags is expected, and so on.  Sparse must be installed separately (it can
-be found at http://www.kernel.org/pub/software/devel/sparse/ if your
+be found at https://sparse.wiki.kernel.org/index.php/Main_Page if your
 distributor does not package it); it can then be run on the code by adding
 "C=1" to your make command.
diff --git a/Documentation/device-mapper/dm-crypt.txt b/Documentation/device-mapper/dm-crypt.txt
index 6680cab2c705..524de926290d 100644
--- a/Documentation/device-mapper/dm-crypt.txt
+++ b/Documentation/device-mapper/dm-crypt.txt
@@ -36,7 +36,7 @@ Example scripts
 ===============
 LUKS (Linux Unified Key Setup) is now the preferred way to set up disk
 encryption with dm-crypt using the 'cryptsetup' utility, see
-http://luks.endorphin.org/
+http://clemens.endorphin.org/cryptography
 [[
 #!/bin/sh
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 1d83d124056c..d0d1df6cb5de 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -445,6 +445,7 @@ Your cooperation is appreciated.
                233 = /dev/kmview       View-OS A process with a view
                234 = /dev/btrfs-control        Btrfs control device
                235 = /dev/autofs       Autofs control device
+                236 = /dev/mapper/control       Device-Mapper control device
                240-254                 Reserved for local use
                255                     Reserved for MISC_DYNAMIC_MINOR
@@ -1517,7 +1518,7 @@ Your cooperation is appreciated.
                    ...
                The driver and documentation may be obtained from
-                http://www.proximity.com.au/~brian/winradio/
+                http://www.winradio.com/
 82 block       I2O hard disk
                  0 = /dev/i2o/hdag     33rd I2O hard disk, whole disk
@@ -1723,7 +1724,7 @@ Your cooperation is appreciated.
                  1 = /dev/comedi1      Second comedi device
                    ...
-                See http://stm.lbl.gov/comedi or http://www.llp.fu-berlin.de/.
+                See http://stm.lbl.gov/comedi.
 98 block       User-mode virtual block device
                  0 = /dev/ubda         First user-mode block device
@@ -1984,7 +1985,7 @@ Your cooperation is appreciated.
                256 NetWare volumes can be supported in a single
                machine.
-                http://www.kernel.org/pub/linux/kernel/people/jmerkey/nwfs
+                http://cgfa.telepac.pt/ftp2/kernel.org/linux/kernel/people/jmerkey/nwfs/
                0 = /dev/nwfs/v0    First NetWare (NWFS) Logical Volume
                1 = /dev/nwfs/v1    Second NetWare (NWFS) Logical Volume
@@ -2591,7 +2592,8 @@ Your cooperation is appreciated.
                  1 = /dev/intermezzo1  Second cache manager
                    ...
-                See http://www.inter-mezzo.org/ for more information.
+                See http://web.archive.org/web/20080115195241/
+                http://inter-mezzo.org/index.html
 186 char        Object-based storage control device
                  0 = /dev/obd0         First obd control device
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt
index 2511a335abd6..121832e5d899 100644
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
@@ -76,7 +76,7 @@ Some very frequently asked questions about linuxtv-dvb
                the TuxBox CVS many interesting DVB applications and the dBox2
                DVB source
-        http://sourceforge.net/projects/dvbsak/
+        http://www.linuxtv.org/downloads/       
                DVB Swiss Army Knife library and utilities
        http://www.nenie.org/misc/mpsys/
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 239cbdbf4d12..350959f4e41b 100644
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -26,7 +26,7 @@ use IO::Handle;
                "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
                "or51211", "or51132_qam", "or51132_vsb", "bluebird",
                "opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718",
-                "af9015", "ngene");
+                "af9015", "ngene", "az6027");
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -518,11 +518,11 @@ sub bluebird {
 sub af9015 {
        my $sourcefile = "download.ashx?file=57";
        my $url = "http://www.ite.com.tw/EN/Services/$sourcefile";
-        my $hash = "ff5b096ed47c080870eacdab2de33ad6";
+        my $hash = "e3f08935158038d385ad382442f4bb2d";
        my $outfile = "dvb-usb-af9015.fw";
        my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
-        my $fwoffset = 0x22708;
+        my $fwoffset = 0x25690;
-        my $fwlength = 18225;
+        my $fwlength = 18725;
        my ($chunklength, $buf, $rcount);
        checkstandard();
@@ -567,6 +567,23 @@ sub ngene {
    "$file1, $file2";
 }
+sub az6027{
+    my $file = "AZ6027_Linux_Driver.tar.gz";
+    my $url = "http://linux.terratec.de/files/$file";
+    my $firmware = "dvb-usb-az6027-03.fw";
+    wgetfile($file, $url);
+    #untar
+    if( system("tar xzvf $file $firmware")){
+        die "failed to untar firmware";
+    }
+    if( system("rm $file")){
+        die ("unable to remove unnecessary files");
+    }
+    $firmware;
+}
 # ---------------------------------------------------------------
 # Utilities
diff --git a/Documentation/fb/framebuffer.txt b/Documentation/fb/framebuffer.txt
index fe79e3c8847d..58c5ae2e9f59 100644
--- a/Documentation/fb/framebuffer.txt
+++ b/Documentation/fb/framebuffer.txt
@@ -330,7 +330,7 @@ and on its mirrors.
 The latest version of fbset can be found at
-    http://home.tvd.be/cr26864/Linux/fbdev/
+    http://www.linux-fbdev.org/ 
  
 10. Credits                                                       
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1571c0c83dba..842aa9de84a6 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -93,7 +93,7 @@ Why:	Broken design for runtime control over driver power states, confusing
        inputs.  This framework was never widely used, and most attempts to
        use it were broken.  Drivers should instead be exposing domain-specific
        interfaces either to kernel or to userspace.
-Who:    Pavel Machek <pavel@suse.cz>
+Who:    Pavel Machek <pavel@ucw.cz>
 ---------------------------
@@ -116,29 +116,6 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 ---------------------------
-What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
-When:   2.6.35/2.6.36
-Files:  drivers/pcmcia/: pcmcia_ioctl.c
-Why:    With the 16-bit PCMCIA subsystem now behaving (almost) like a
-        normal hotpluggable bus, and with it using the default kernel
-        infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
-        control ioctl needed by cardmgr and cardctl from pcmcia-cs is
-        unnecessary and potentially harmful (it does not provide for
-        proper locking), and makes further cleanups and integration of the
-        PCMCIA subsystem into the Linux kernel device driver model more
-        difficult. The features provided by cardmgr and cardctl are either
-        handled by the kernel itself now or are available in the new
-        pcmciautils package available at
-        http://kernel.org/pub/linux/utils/kernel/pcmcia/
-        For all architectures except ARM, the associated config symbol
-        has been removed from kernel 2.6.34; for ARM, it will be likely
-        be removed from kernel 2.6.35. The actual code will then likely
-        be removed from kernel 2.6.36.
-Who:    Dominik Brodowski <linux@dominikbrodowski.net>
---------------------------
 What:   sys_sysctl
 When:   September 2010
 Option: CONFIG_SYSCTL_SYSCALL
@@ -174,6 +151,31 @@ Who:	Eric Biederman <ebiederm@xmission.com>
 ---------------------------
+What:   /proc/<pid>/oom_adj
+When:   August 2012
+Why:    /proc/<pid>/oom_adj allows userspace to influence the oom killer's
+        badness heuristic used to determine which task to kill when the kernel
+        is out of memory.
+        The badness heuristic has since been rewritten since the introduction of
+        this tunable such that its meaning is deprecated.  The value was
+        implemented as a bitshift on a score generated by the badness()
+        function that did not have any precise units of measure.  With the
+        rewrite, the score is given as a proportion of available memory to the
+        task allocating pages, so using a bitshift which grows the score
+        exponentially is, thus, impossible to tune with fine granularity.
+        A much more powerful interface, /proc/<pid>/oom_score_adj, was
+        introduced with the oom killer rewrite that allows users to increase or
+        decrease the badness() score linearly.  This interface will replace
+        /proc/<pid>/oom_adj.
+        A warning will be emitted to the kernel log if an application uses this
+        deprecated interface.  After it is printed once, future warnings will be
+        suppressed until the kernel is rebooted.
+---------------------------
 What:   remove EXPORT_SYMBOL(kernel_thread)
 When:   August 2006
 Files:  arch/*/kernel/*_ksyms.c
@@ -303,15 +305,6 @@ Who:	Johannes Berg <johannes@sipsolutions.net>
 ---------------------------
-What: CONFIG_NF_CT_ACCT
-When: 2.6.29
-Why:  Accounting can now be enabled/disabled without kernel recompilation.
-      Currently used only to set a default value for a feature that is also
-      controlled by a kernel/module/sysfs/sysctl parameter.
-Who:  Krzysztof Piotr Oledzki <ole@ans.pl>
---------------------------
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -367,24 +360,6 @@ When:	2.6.33
 Why:    Should be implemented in userspace, policy daemon.
 Who:    Johannes Berg <johannes@sipsolutions.net>
---------------------------
-What:   CONFIG_INOTIFY
-When:   2.6.33
-Why:    last user (audit) will be converted to the newer more generic
-        and more easily maintained fsnotify subsystem
-Who:    Eric Paris <eparis@redhat.com>
----------------------------
-What:   lock_policy_rwsem_* and unlock_policy_rwsem_* will not be
-        exported interface anymore.
-When:   2.6.33
-Why:    cpu_policy_rwsem has a new cleaner definition making it local to
-        cpufreq core and contained inside cpufreq.c. Other dependent
-        drivers should not use it in order to safely avoid lockdep issues.
-Who:    Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 ----------------------------
 What:   sound-slot/service-* module aliases and related clutters in
@@ -459,57 +434,6 @@ Who:	Corentin Chary <corentin.chary@gmail.com>
 ----------------------------
-What:   usbvideo quickcam_messenger driver
-When:   2.6.35
-Files:  drivers/media/video/usbvideo/quickcam_messenger.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_stv06xx
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
-What:   ov511 v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/ov511.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_ov519
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
-What:   w9968cf v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/w9968cf*.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_ov519
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
-What:   ovcamchip sensor framework
-When:   2.6.35
-Files:  drivers/media/video/ovcamchip/*
-Why:    Only used by obsoleted v4l1 drivers
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
-What:   stv680 v4l1 driver
-When:   2.6.35
-Files:  drivers/media/video/stv680.[ch]
-Why:    obsolete v4l1 driver replaced by gspca_stv0680
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
-What:   zc0301 v4l driver
-When:   2.6.35
-Files:  drivers/media/video/zc0301/*
-Why:    Duplicate functionality with the gspca_zc3xx driver, zc0301 only
-        supports 2 USB-ID's (because it only supports a limited set of
-        sensors) wich are also supported by the gspca_zc3xx driver
-        (which supports 53 USB-ID's in total)
-Who:    Hans de Goede <hdegoede@redhat.com>
----------------------------
 What:   sysfs-class-rfkill state file
 When:   Feb 2014
 Files:  net/rfkill/core.c
@@ -538,37 +462,6 @@ Who:	Jan Kiszka <jan.kiszka@web.de>
 ----------------------------
-What:   KVM memory aliases support
-When:   July 2010
-Why:    Memory aliasing support is used for speeding up guest vga access
-        through the vga windows.
-        Modern userspace no longer uses this feature, so it's just bitrotted
-        code and can be removed with no impact.
-Who:    Avi Kivity <avi@redhat.com>
----------------------------
-What:   xtime, wall_to_monotonic
-When:   2.6.36+
-Files:  kernel/time/timekeeping.c include/linux/time.h
-Why:    Cleaning up timekeeping internal values. Please use
-        existing timekeeping accessor functions to access
-        the equivalent functionality.
-Who:    John Stultz <johnstul@us.ibm.com>
----------------------------
-What:   KVM kernel-allocated memory slots
-When:   July 2010
-Why:    Since 2.6.25, kvm supports user-allocated memory slots, which are
-        much more flexible than kernel-allocated slots.  All current userspace
-        supports the newer interface and this code can be removed with no
-        impact.
-Who:    Avi Kivity <avi@redhat.com>
----------------------------
 What:   KVM paravirt mmu host support
 When:   January 2011
 Why:    The paravirt mmu host support is slower than non-paravirt mmu, both
@@ -654,3 +547,20 @@ Why:	superseded by acpi_sleep=nonvs
 Who:    Rafael J. Wysocki <rjw@sisk.pl>
 ----------------------------
+What:   PCI DMA unmap state API
+When:   August 2012
+Why:    PCI DMA unmap state API (include/linux/pci-dma.h) was replaced
+        with DMA unmap state API (DMA unmap state API can be used for
+        any bus).
+Who:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+----------------------------
+What:   DMA_xxBIT_MASK macros
+When:   Jun 2011
+Why:    DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
+Who:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
+----------------------------
diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index c0236e753bc8..f9765e8cf086 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -128,7 +128,7 @@ OPTIONS
 RESOURCES
 =========
-Our current recommendation is to use Inferno (http://www.vitanuova.com/inferno)
+Our current recommendation is to use Inferno (http://www.vitanuova.com/nferno/index.html)
 as the 9p server.  You can start a 9p server under Inferno by issuing the
 following command:
   ; styxlisten -A tcp!*!564 export '#U*'
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 96d4293607ec..2db4283efa8d 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -92,8 +92,8 @@ prototypes:
        void (*destroy_inode)(struct inode *);
        void (*dirty_inode) (struct inode *);
        int (*write_inode) (struct inode *, int);
-        void (*drop_inode) (struct inode *);
+        int (*drop_inode) (struct inode *);
-        void (*delete_inode) (struct inode *);
+        void (*evict_inode) (struct inode *);
        void (*put_super) (struct super_block *);
        void (*write_super) (struct super_block *);
        int (*sync_fs)(struct super_block *sb, int wait);
@@ -101,14 +101,13 @@ prototypes:
        int (*unfreeze_fs) (struct super_block *);
        int (*statfs) (struct dentry *, struct kstatfs *);
        int (*remount_fs) (struct super_block *, int *, char *);
-        void (*clear_inode) (struct inode *);
        void (*umount_begin) (struct super_block *);
        int (*show_options)(struct seq_file *, struct vfsmount *);
        ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
        ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
 locking rules:
-        All may block.
+        All may block [not true, see below]
        None have BKL
                        s_umount
 alloc_inode:
@@ -116,22 +115,25 @@ destroy_inode:
 dirty_inode:                            (must not sleep)
 write_inode:
 drop_inode:                             !!!inode_lock!!!
-delete_inode:
+evict_inode:
 put_super:              write
 write_super:            read
 sync_fs:                read
 freeze_fs:              read
 unfreeze_fs:            read
-statfs:                 no
+statfs:                 maybe(read)     (see below)
-remount_fs:             maybe           (see below)
+remount_fs:             write
-clear_inode:
 umount_begin:           no
 show_options:           no              (namespace_sem)
 quota_read:             no              (see below)
 quota_write:            no              (see below)
->remount_fs() will have the s_umount exclusive lock if it's already mounted.
+->statfs() has s_umount (shared) when called by ustat(2) (native or
-When called from get_sb_single, it does NOT have the s_umount lock.
+compat), but that's an accident of bad API; s_umount is used to pin
+the superblock down when we only have dev_t given us by userland to
+identify the superblock.  Everything else (statfs(), fstatfs(), etc.)
+doesn't hold it when calling ->statfs() - superblock is pinned down
+by resolving the pathname passed to syscall.
 ->quota_read() and ->quota_write() functions are both guaranteed to
 be the only ones operating on the quota file by the quota code (via
 dqio_sem) (unless an admin really wants to screw up something and
@@ -372,8 +374,6 @@ prototypes:
        ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
        int (*readdir) (struct file *, void *, filldir_t);
        unsigned int (*poll) (struct file *, struct poll_table_struct *);
-        int (*ioctl) (struct inode *, struct file *, unsigned int,
-                        unsigned long);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);
@@ -407,8 +407,7 @@ write:			no
 aio_write:              no
 readdir:                no
 poll:                   no
-ioctl:                  yes     (see below)
+unlocked_ioctl:         no
-unlocked_ioctl:         no      (see below)
 compat_ioctl:           no
 mmap:                   no
 open:                   no
@@ -451,9 +450,6 @@ move ->readdir() to inode_operations and use a separate method for directory
 anything that resembles union-mount we won't have a struct file for all
 components. And there are other reasons why the current interface is a mess...
->ioctl() on regular files is superceded by the ->unlocked_ioctl() that
-doesn't take the BKL.
 ->read on directories probably must go away - we should just enforce -EISDIR
 in sys_read() and friends.
diff --git a/Documentation/filesystems/affs.txt b/Documentation/filesystems/affs.txt
index 2d1524469c25..81ac488e3758 100644
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
@@ -216,4 +216,4 @@ due to an incompatibility with the Amiga floppy controller.
 If you are interested in an Amiga Emulator for Linux, look at
-http://www.freiburg.linux.de/~uae/
+http://web.archive.org/web/*/http://www.freiburg.linux.de/~uae/
diff --git a/Documentation/filesystems/befs.txt b/Documentation/filesystems/befs.txt
index 67391a15949a..6e49c363938e 100644
--- a/Documentation/filesystems/befs.txt
+++ b/Documentation/filesystems/befs.txt
@@ -31,7 +31,7 @@ Current maintainer: Sergey S. Kostyliov <rathamahata@php4.ru>
 WHAT IS THIS DRIVER?
 ==================
-This module implements the native filesystem of BeOS <http://www.be.com/>
+This module implements the native filesystem of BeOS http://www.beincorporated.com/ 
 for the linux 2.4.1 and later kernels. Currently it is a read-only
 implementation.
@@ -61,7 +61,7 @@ step 2.  Configuration & make kernel
 The linux kernel has many compile-time options. Most of them are beyond the
 scope of this document. I suggest the Kernel-HOWTO document as a good general
-reference on this topic. <http://www.linux.com/howto/Kernel-HOWTO.html>
+reference on this topic. http://www.linuxdocs.org/HOWTOs/Kernel-HOWTO-4.html 
 However, to use the BeFS module, you must enable it at configure time.
diff --git a/Documentation/filesystems/caching/fscache.txt b/Documentation/filesystems/caching/fscache.txt
index a91e2e2095b0..770267af5b3e 100644
--- a/Documentation/filesystems/caching/fscache.txt
+++ b/Documentation/filesystems/caching/fscache.txt
@@ -343,8 +343,8 @@ This will look something like:
        [root@andromeda ~]# head /proc/fs/fscache/objects
        OBJECT   PARENT   STAT CHLDN OPS OOP IPR EX READS EM EV F S | NETFS_COOKIE_DEF TY FL NETFS_DATA       OBJECT_KEY, AUX_DATA
        ======== ======== ==== ===== === === === == ===== == == = = | ================ == == ================ ================
-           17e4b        2 ACTV     0   0   0   0  0     0 7b  4 0 8 | NFS.fh           DT  0 ffff88001dd82820 010006017edcf8bbc93b43298fdfbe71e50b57b13a172c0117f38472, e567634700000000000000000000000063f2404a000000000000000000000000c9030000000000000000000063f2404a
+           17e4b        2 ACTV     0   0   0   0  0     0 7b  4 0 0 | NFS.fh           DT  0 ffff88001dd82820 010006017edcf8bbc93b43298fdfbe71e50b57b13a172c0117f38472, e567634700000000000000000000000063f2404a000000000000000000000000c9030000000000000000000063f2404a
-           1693a        2 ACTV     0   0   0   0  0     0 7b  4 0 8 | NFS.fh           DT  0 ffff88002db23380 010006017edcf8bbc93b43298fdfbe71e50b57b1e0162c01a2df0ea6, 420ebc4a000000000000000000000000420ebc4a0000000000000000000000000e1801000000000000000000420ebc4a
+           1693a        2 ACTV     0   0   0   0  0     0 7b  4 0 0 | NFS.fh           DT  0 ffff88002db23380 010006017edcf8bbc93b43298fdfbe71e50b57b1e0162c01a2df0ea6, 420ebc4a000000000000000000000000420ebc4a0000000000000000000000000e1801000000000000000000420ebc4a
 where the first set of columns before the '|' describe the object:
@@ -362,7 +362,7 @@ where the first set of columns before the '|' describe the object:
        EM      Object's event mask
        EV      Events raised on this object
        F       Object flags
-        S       Object slow-work work item flags
+        S       Object work item busy state mask (1:pending 2:running)
 and the second set of columns describe the object's cookie, if present:
@@ -395,8 +395,8 @@ and the following paired letters:
        w       Show objects that don't have pending writes
        R       Show objects that have outstanding reads
        r       Show objects that don't have outstanding reads
-        S       Show objects that have slow work queued
+        S       Show objects that have work queued
-        s       Show objects that don't have slow work queued
+        s       Show objects that don't have work queued
 If neither side of a letter pair is given, then both are implied.  For example:
diff --git a/Documentation/filesystems/isofs.txt b/Documentation/filesystems/isofs.txt
index 3c367c3b3608..ba0a93384de0 100644
--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
@@ -41,7 +41,7 @@ Mount options unique to the isofs filesystem.
  sbsector=xxx  Session begins from sector xxx
 Recommended documents about ISO 9660 standard are located at:
-http://www.y-adagio.com/public/standards/iso_cdromr/tocont.htm
+http://www.y-adagio.com/
 ftp://ftp.ecma.ch/ecma-st/Ecma-119.pdf
 Quoting from the PDF "This 2nd Edition of Standard ECMA-119 is technically 
 identical with ISO 9660.", so it is a valid and gratis substitute of the
diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt
index 3ba0b945aaf8..f2430a7974e1 100644
--- a/Documentation/filesystems/nfs/nfsroot.txt
+++ b/Documentation/filesystems/nfs/nfsroot.txt
@@ -124,6 +124,8 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
  <hostname>    Name of the client. May be supplied by autoconfiguration,
                but its absence will not trigger autoconfiguration.
+                If specified and DHCP is used, the user provided hostname will
+                be carried in the DHCP request to hopefully update DNS record.
                Default: Client IP address is used in ASCII notation.
diff --git a/Documentation/filesystems/nilfs2.txt b/Documentation/filesystems/nilfs2.txt
index d3e7673995eb..d5c0cef38a71 100644
--- a/Documentation/filesystems/nilfs2.txt
+++ b/Documentation/filesystems/nilfs2.txt
@@ -49,7 +49,10 @@ Mount options
 NILFS2 supports the following mount options:
 (*) == default
-nobarrier               Disables barriers.
+barrier(*)              This enables/disables the use of write barriers.  This
+nobarrier               requires an IO stack which can support barriers, and
+                        if nilfs gets an error on a barrier write, it will
+                        disable again with a warning.
 errors=continue         Keep going on a filesystem error.
 errors=remount-ro(*)    Remount the filesystem read-only on an error.
 errors=panic            Panic and halt the machine if an error occurs.
@@ -74,9 +77,10 @@ norecovery		Disable recovery of the filesystem on mount.
                        This disables every write access on the device for
                        read-only mounts or snapshots.  This option will fail
                        for r/w mounts on an unclean volume.
-discard                 Issue discard/TRIM commands to the underlying block
+discard                 This enables/disables the use of discard/TRIM commands.
-                        device when blocks are freed.  This is useful for SSD
+nodiscard(*)            The discard/TRIM commands are sent to the underlying
-                        devices and sparse/thinly-provisioned LUNs.
+                        block device when blocks are freed.  This is useful
+                        for SSD devices and sparse/thinly-provisioned LUNs.
 NILFS2 usage
 ============
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index a7e9746ee7ea..b12c89538680 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -273,3 +273,48 @@ it's safe to remove it.  If you don't need it, remove it.
 deliberate; as soon as struct block_device * is propagated in a reasonable
 way by that code fixing will become trivial; until then nothing can be
 done.
+[mandatory]
+        block truncatation on error exit from ->write_begin, and ->direct_IO
+moved from generic methods (block_write_begin, cont_write_begin,
+nobh_write_begin, blockdev_direct_IO*) to callers.  Take a look at
+ext2_write_failed and callers for an example.
+[mandatory]
+        ->truncate is going away.  The whole truncate sequence needs to be
+implemented in ->setattr, which is now mandatory for filesystems
+implementing on-disk size changes.  Start with a copy of the old inode_setattr
+and vmtruncate, and the reorder the vmtruncate + foofs_vmtruncate sequence to
+be in order of zeroing blocks using block_truncate_page or similar helpers,
+size update and on finally on-disk truncation which should not fail.
+inode_change_ok now includes the size checks for ATTR_SIZE and must be called
+in the beginning of ->setattr unconditionally.
+[mandatory]
+        ->clear_inode() and ->delete_inode() are gone; ->evict_inode() should
+be used instead.  It gets called whenever the inode is evicted, whether it has
+remaining links or not.  Caller does *not* evict the pagecache or inode-associated
+metadata buffers; getting rid of those is responsibility of method, as it had
+been for ->delete_inode().
+        ->drop_inode() returns int now; it's called on final iput() with inode_lock
+held and it returns true if filesystems wants the inode to be dropped.  As before,
+generic_drop_inode() is still the default and it's been updated appropriately.
+generic_delete_inode() is also alive and it consists simply of return 1.  Note that
+all actual eviction work is done by caller after ->drop_inode() returns.
+        clear_inode() is gone; use end_writeback() instead.  As before, it must
+be called exactly once on each call of ->evict_inode() (as it used to be for
+each call of ->delete_inode()).  Unlike before, if you are using inode-associated
+metadata buffers (i.e. mark_buffer_dirty_inode()), it's your responsibility to
+call invalidate_inode_buffers() before end_writeback().
+        No async writeback (and thus no calls of ->write_inode()) will happen
+after end_writeback() returns, so actions that should not overlap with ->write_inode()
+(e.g. freeing on-disk inode if i_nlink is 0) ought to be done after that call.
+        NOTE: checking i_nlink in the beginning of ->write_inode() and bailing out
+if it's zero is not *and* *never* *had* *been* enough.  Final unlink() and iput()
+may happen while the inode is in the middle of ->write_inode(); e.g. if you blindly
+free the on-disk inode, you may end up doing that while ->write_inode() is writing
+to it.
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 9fb6cbe70bde..a6aca8740883 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -33,7 +33,8 @@ Table of Contents
  2     Modifying System Parameters
  3     Per-Process Parameters
-  3.1   /proc/<pid>/oom_adj - Adjust the oom-killer score
+  3.1   /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj - Adjust the oom-killer
+                                                                score
  3.2   /proc/<pid>/oom_score - Display current oom-killer score
  3.3   /proc/<pid>/io - Display the IO accounting fields
  3.4   /proc/<pid>/coredump_filter - Core dump filtering settings
@@ -73,9 +74,9 @@ contact Bodo  Bauer  at  bb@ricochet.net.  We'll  be happy to add them to this
 document.
 The   latest   version    of   this   document   is    available   online   at
-http://skaro.nightcrawler.com/~bb/Docs/Proc as HTML version.
+http://tldp.org/LDP/Linux-Filesystem-Hierarchy/html/proc.html
-If  the above  direction does  not works  for you,  ypu could  try the  kernel
+If  the above  direction does  not works  for you,  you could  try the  kernel
 mailing  list  at  linux-kernel@vger.kernel.org  and/or try  to  reach  me  at
 comandante@zaralinux.com.
@@ -1234,42 +1235,64 @@ of the kernel.
 CHAPTER 3: PER-PROCESS PARAMETERS
 ------------------------------------------------------------------------------
-3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score
+3.1 /proc/<pid>/oom_adj & /proc/<pid>/oom_score_adj- Adjust the oom-killer score
------------------------------------------------------
+--------------------------------------------------------------------------------
-This file can be used to adjust the score used to select which processes
+These file can be used to adjust the badness heuristic used to select which
-should be killed in an  out-of-memory  situation.  Giving it a high score will
+process gets killed in out of memory conditions.
-increase the likelihood of this process being killed by the oom-killer.  Valid
-values are in the range -16 to +15, plus the special value -17, which disables
+The badness heuristic assigns a value to each candidate task ranging from 0
-oom-killing altogether for this process.
+(never kill) to 1000 (always kill) to determine which process is targeted.  The
+units are roughly a proportion along that range of allowed memory the process
-The process to be killed in an out-of-memory situation is selected among all others
+may allocate from based on an estimation of its current memory and swap use.
-based on its badness score. This value equals the original memory size of the process
+For example, if a task is using all allowed memory, its badness score will be
-and is then updated according to its CPU time (utime + stime) and the
+1000.  If it is using half of its allowed memory, its score will be 500.
-run time (uptime - start time). The longer it runs the smaller is the score.
-Badness score is divided by the square root of the CPU time and then by
+There is an additional factor included in the badness score: root
-the double square root of the run time.
+processes are given 3% extra memory over other tasks.
-Swapped out tasks are killed first. Half of each child's memory size is added to
+The amount of "allowed" memory depends on the context in which the oom killer
-the parent's score if they do not share the same memory. Thus forking servers
+was called.  If it is due to the memory assigned to the allocating task's cpuset
-are the prime candidates to be killed. Having only one 'hungry' child will make
+being exhausted, the allowed memory represents the set of mems assigned to that
-parent less preferable than the child.
+cpuset.  If it is due to a mempolicy's node(s) being exhausted, the allowed
+memory represents the set of mempolicy nodes.  If it is due to a memory
-/proc/<pid>/oom_score shows process' current badness score.
+limit (or swap limit) being reached, the allowed memory is that configured
+limit.  Finally, if it is due to the entire system being out of memory, the
-The following heuristics are then applied:
+allowed memory represents all allocatable resources.
- * if the task was reniced, its score doubles
- * superuser or direct hardware access tasks (CAP_SYS_ADMIN, CAP_SYS_RESOURCE
+The value of /proc/<pid>/oom_score_adj is added to the badness score before it
-        or CAP_SYS_RAWIO) have their score divided by 4
+is used to determine which task to kill.  Acceptable values range from -1000
- * if oom condition happened in one cpuset and checked process does not belong
+(OOM_SCORE_ADJ_MIN) to +1000 (OOM_SCORE_ADJ_MAX).  This allows userspace to
-        to it, its score is divided by 8
+polarize the preference for oom killing either by always preferring a certain
- * the resulting score is multiplied by two to the power of oom_adj, i.e.
+task or completely disabling it.  The lowest possible value, -1000, is
-        points <<= oom_adj when it is positive and
+equivalent to disabling oom killing entirely for that task since it will always
-        points >>= -(oom_adj) otherwise
+report a badness score of 0.
-The task with the highest badness score is then selected and its children
+Consequently, it is very simple for userspace to define the amount of memory to
-are killed, process itself will be killed in an OOM situation when it does
+consider for each task.  Setting a /proc/<pid>/oom_score_adj value of +500, for
-not have children or some of them disabled oom like described above.
+example, is roughly equivalent to allowing the remainder of tasks sharing the
+same system, cpuset, mempolicy, or memory controller resources to use at least
+50% more memory.  A value of -500, on the other hand, would be roughly
+equivalent to discounting 50% of the task's allowed memory from being considered
+as scoring against the task.
+For backwards compatibility with previous kernels, /proc/<pid>/oom_adj may also
+be used to tune the badness score.  Its acceptable values range from -16
+(OOM_ADJUST_MIN) to +15 (OOM_ADJUST_MAX) and a special value of -17
+(OOM_DISABLE) to disable oom killing entirely for that task.  Its value is
+scaled linearly with /proc/<pid>/oom_score_adj.
+Writing to /proc/<pid>/oom_score_adj or /proc/<pid>/oom_adj will change the
+other with its scaled value.
+NOTICE: /proc/<pid>/oom_adj is deprecated and will be removed, please see
+Documentation/feature-removal-schedule.txt.
+Caveat: when a parent task is selected, the oom killer will sacrifice any first
+generation children with seperate address spaces instead, if possible.  This
+avoids servers and important system daemons from being killed and loses the
+minimal amount of work.
 3.2 /proc/<pid>/oom_score - Display current oom-killer score
 -------------------------------------------------------------
diff --git a/Documentation/filesystems/squashfs.txt b/Documentation/filesystems/squashfs.txt
index 203f7202cc9e..66699afd66ca 100644
--- a/Documentation/filesystems/squashfs.txt
+++ b/Documentation/filesystems/squashfs.txt
@@ -2,7 +2,7 @@ SQUASHFS 4.0 FILESYSTEM
 =======================
 Squashfs is a compressed read-only filesystem for Linux.
-It uses zlib compression to compress files, inodes and directories.
+It uses zlib/lzo compression to compress files, inodes and directories.
 Inodes in the system are very small and all blocks are packed to minimise
 data overhead. Block sizes greater than 4K are supported up to a maximum
 of 1Mbytes (default block size 128K).
diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt
index 85354b32d731..74eaac26f8b8 100644
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
@@ -39,7 +39,7 @@ files, each with their own function.
       local_cpus          nearby CPU mask (cpumask, ro)
       remove              remove device from kernel's list (ascii, wo)
       resource            PCI resource host addresses (ascii, ro)
-       resource0..N        PCI resource N, if present (binary, mmap)
+       resource0..N        PCI resource N, if present (binary, mmap, rw[1])
       resource0_wc..N_wc  PCI WC map resource N, if prefetchable (binary, mmap)
       rom                 PCI ROM resource, if present (binary, ro)
       subsystem_device    PCI subsystem device (ascii, ro)
@@ -54,13 +54,16 @@ files, each with their own function.
  binary - file contains binary data
  cpumask - file contains a cpumask type
+[1] rw for RESOURCE_IO (I/O port) regions only
 The read only files are informational, writes to them will be ignored, with
 the exception of the 'rom' file.  Writable files can be used to perform
 actions on the device (e.g. changing config space, detaching a device).
 mmapable files are available via an mmap of the file at offset 0 and can be
 used to do actual device programming from userspace.  Note that some platforms
 don't support mmapping of certain resources, so be sure to check the return
-value from any attempted mmap.
+value from any attempted mmap.  The most notable of these are I/O port
+resources, which also provide read/write access.
 The 'enable' file provides a counter that indicates how many times the device 
 has been enabled.  If the 'enable' file currently returns '4', and a '1' is
diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index 931c806642c5..5d1335faec2d 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -4,7 +4,7 @@ sysfs - _The_ filesystem for exporting kernel objects.
 Patrick Mochel  <mochel@osdl.org>
 Mike Murphy <mamurph@cs.clemson.edu>
-Revised:    22 February 2009
+Revised:    15 July 2010
 Original:   10 January 2003
@@ -124,7 +124,7 @@ show and store methods of the attribute owners.
 struct sysfs_ops {
        ssize_t (*show)(struct kobject *, struct attribute *, char *);
-        ssize_t (*store)(struct kobject *, struct attribute *, const char *);
+        ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
 };
 [ Subsystems should have already defined a struct kobj_type as a
@@ -139,18 +139,22 @@ calls the associated methods.
 To illustrate:
+#define to_dev(obj) container_of(obj, struct device, kobj)
 #define to_dev_attr(_attr) container_of(_attr, struct device_attribute, attr)
-#define to_dev(d) container_of(d, struct device, kobj)
-static ssize_t
+static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr,
-dev_attr_show(struct kobject * kobj, struct attribute * attr, char * buf)
+                             char *buf)
 {
-        struct device_attribute * dev_attr = to_dev_attr(attr);
+        struct device_attribute *dev_attr = to_dev_attr(attr);
-        struct device * dev = to_dev(kobj);
+        struct device *dev = to_dev(kobj);
-        ssize_t ret = 0;
+        ssize_t ret = -EIO;
        if (dev_attr->show)
-                ret = dev_attr->show(dev, buf);
+                ret = dev_attr->show(dev, dev_attr, buf);
+        if (ret >= (ssize_t)PAGE_SIZE) {
+                print_symbol("dev_attr_show: %s returned bad count\n",
+                                (unsigned long)dev_attr->show);
+        }
        return ret;
 }
@@ -163,10 +167,9 @@ To read or write attributes, show() or store() methods must be
 specified when declaring the attribute. The method types should be as
 simple as those defined for device attributes:
-ssize_t (*show)(struct device * dev, struct device_attribute * attr,
+ssize_t (*show)(struct device *dev, struct device_attribute *attr, char *buf);
-                char * buf);
+ssize_t (*store)(struct device *dev, struct device_attribute *attr,
-ssize_t (*store)(struct device * dev, struct device_attribute * attr,
+                 const char *buf, size_t count);
-                 const char * buf);
 IOW, they should take only an object, an attribute, and a buffer as parameters.
@@ -209,8 +212,8 @@ Other notes:
 - show() should always use snprintf(). 
- store() should return the number of bytes used from the buffer. This
+- store() should return the number of bytes used from the buffer. If the
-  can be done using strlen().
+  entire buffer has been used, just return the count argument.
 - show() or store() can always return errors. If a bad value comes
  through, be sure to return an error.
@@ -223,15 +226,18 @@ Other notes:
 A very simple (and naive) implementation of a device attribute is:
-static ssize_t show_name(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_name(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
        return snprintf(buf, PAGE_SIZE, "%s\n", dev->name);
 }
-static ssize_t store_name(struct device * dev, const char * buf)
+static ssize_t store_name(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
 {
-        sscanf(buf, "%20s", dev->name);
+        snprintf(dev->name, sizeof(dev->name), "%.*s",
-        return strnlen(buf, PAGE_SIZE);
+                 (int)min(count, sizeof(dev->name) - 1), buf);
+        return count;
 }
 static DEVICE_ATTR(name, S_IRUGO, show_name, store_name);
@@ -327,7 +333,7 @@ Structure:
 struct bus_attribute {
        struct attribute        attr;
        ssize_t (*show)(struct bus_type *, char * buf);
-        ssize_t (*store)(struct bus_type *, const char * buf);
+        ssize_t (*store)(struct bus_type *, const char * buf, size_t count);
 };
 Declaring:
diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index eed520fd0c8e..ead764b2728f 100644
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -165,7 +165,8 @@ TEST SUITE
 If you plan to make any modifications to the vfat filesystem, please
 get the test suite that comes with the vfat distribution at
-  http://bmrc.berkeley.edu/people/chaffee/vfat.html
+  http://web.archive.org/web/*/http://bmrc.berkeley.edu/
+  people/chaffee/vfat.html
 This tests quite a few parts of the vfat filesystem and additional
 tests for new features or untested features would be appreciated.
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 94677e7dcb13..ed7e5efc06d8 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -727,7 +727,6 @@ struct file_operations {
        ssize_t (*aio_write) (struct kiocb *, const struct iovec *, unsigned long, loff_t);
        int (*readdir) (struct file *, void *, filldir_t);
        unsigned int (*poll) (struct file *, struct poll_table_struct *);
-        int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);
@@ -768,10 +767,7 @@ otherwise noted.
        activity on this file and (optionally) go to sleep until there
        is activity. Called by the select(2) and poll(2) system calls
-  ioctl: called by the ioctl(2) system call
+  unlocked_ioctl: called by the ioctl(2) system call.
-  unlocked_ioctl: called by the ioctl(2) system call. Filesystems that do not
-        require the BKL should use this method instead of the ioctl() above.
  compat_ioctl: called by the ioctl(2) system call when 32 bit system calls
         are used on 64 bit kernels.
diff --git a/Documentation/filesystems/xfs.txt b/Documentation/filesystems/xfs.txt
index 9878f50d6ed6..7bff3e4f35df 100644
--- a/Documentation/filesystems/xfs.txt
+++ b/Documentation/filesystems/xfs.txt
@@ -131,17 +131,6 @@ When mounting an XFS filesystem, the following options are accepted.
        Don't check for double mounted file systems using the file system uuid.
        This is useful to mount LVM snapshot volumes.
-  osyncisosync
-        Make O_SYNC writes implement true O_SYNC.  WITHOUT this option,
-        Linux XFS behaves as if an "osyncisdsync" option is used,
-        which will make writes to files opened with the O_SYNC flag set
-        behave as if the O_DSYNC flag had been used instead.
-        This can result in better performance without compromising
-        data safety.
-        However if this option is not in effect, timestamp updates from
-        O_SYNC writes can be lost if the system crashes.
-        If timestamp updates are critical, use the osyncisosync option.
  uquota/usrquota/uqnoenforce/quota
        User disk quota accounting enabled, and limits (optionally)
        enforced.  Refer to xfs_quota(8) for further details.
diff --git a/Documentation/firmware_class/hotplug-script b/Documentation/firmware_class/hotplug-script
index 1990130f2ab1..8143a950b607 100644
--- a/Documentation/firmware_class/hotplug-script
+++ b/Documentation/firmware_class/hotplug-script
@@ -6,11 +6,12 @@
 HOTPLUG_FW_DIR=/usr/lib/hotplug/firmware/
-echo 1 > /sys/$DEVPATH/loading
+if [ "$SUBSYSTEM" == "firmware" -a "$ACTION" == "add" ]; then
-cat $HOTPLUG_FW_DIR/$FIRMWARE > /sys/$DEVPATH/data
+  if [ -f $HOTPLUG_FW_DIR/$FIRMWARE ]; then
-echo 0 > /sys/$DEVPATH/loading
+    echo 1 > /sys/$DEVPATH/loading
+    cat $HOTPLUG_FW_DIR/$FIRMWARE > /sys/$DEVPATH/data
-# To cancel the load in case of error:
+    echo 0 > /sys/$DEVPATH/loading
-#
+  else
-#       echo -1 > /sys/$DEVPATH/loading
+    echo -1 > /sys/$DEVPATH/loading
-#
+  fi
+fi
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index c2c6e9b39bbe..d96a6dba5748 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -158,10 +158,11 @@ and configure pullups/pulldowns appropriately.)
 Spinlock-Safe GPIO access
 -------------------------
 Most GPIO controllers can be accessed with memory read/write instructions.
-That doesn't need to sleep, and can safely be done from inside IRQ handlers.
+Those don't need to sleep, and can safely be done from inside hard
-(That includes hardirq contexts on RT kernels.)
+(nonthreaded) IRQ handlers and similar contexts.
-Use these calls to access such GPIOs:
+Use the following calls to access such GPIOs,
+for which gpio_cansleep() will always return false (see below):
        /* GPIO INPUT:  return zero or nonzero */
        int gpio_get_value(unsigned gpio);
@@ -210,9 +211,31 @@ To access such GPIOs, a different set of accessors is defined:
        /* GPIO OUTPUT, might sleep */
        void gpio_set_value_cansleep(unsigned gpio, int value);
-Other than the fact that these calls might sleep, and will not be ignored
-for GPIOs that can't be accessed from IRQ handlers, these calls act the
+Accessing such GPIOs requires a context which may sleep,  for example
-same as the spinlock-safe calls.
+a threaded IRQ handler, and those accessors must be used instead of
+spinlock-safe accessors without the cansleep() name suffix.
+Other than the fact that these accessors might sleep, and will work
+on GPIOs that can't be accessed from hardIRQ handlers, these calls act
+the same as the spinlock-safe calls.
+  ** IN ADDITION ** calls to setup and configure such GPIOs must be made
+from contexts which may sleep, since they may need to access the GPIO
+controller chip too:  (These setup calls are usually made from board
+setup or driver probe/teardown code, so this is an easy constraint.)
+        gpio_direction_input()
+        gpio_direction_output()
+        gpio_request()
+##      gpio_request_one()
+##      gpio_request_array()
+##      gpio_free_array()
+        gpio_free()
+        gpio_set_debounce()
 Claiming and Releasing GPIOs
diff --git a/Documentation/hwmon/adm1026 b/Documentation/hwmon/adm1026
index f4327db2307e..d8fabe0c23ac 100644
--- a/Documentation/hwmon/adm1026
+++ b/Documentation/hwmon/adm1026
@@ -6,7 +6,7 @@ Supported chips:
    Prefix: 'adm1026'
    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
    Datasheet: Publicly available at the Analog Devices website
-               http://www.analog.com/en/prod/0,,766_825_ADM1026,00.html
+               http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026
 Authors:
        Philip Pokorny <ppokorny@penguincomputing.com> for Penguin Computing
diff --git a/Documentation/hwmon/coretemp b/Documentation/hwmon/coretemp
index 92267b62db59..25568f844804 100644
--- a/Documentation/hwmon/coretemp
+++ b/Documentation/hwmon/coretemp
@@ -21,8 +21,8 @@ Temperature is measured in degrees Celsius and measurement resolution is
 1 degree C. Valid temperatures are from 0 to TjMax degrees C, because
 the actual value of temperature register is in fact a delta from TjMax.
-Temperature known as TjMax is the maximum junction temperature of processor.
+Temperature known as TjMax is the maximum junction temperature of processor,
-Intel defines this temperature as 85C or 100C. At this temperature, protection
+which depends on the CPU model. See table below. At this temperature, protection
 mechanism will perform actions to forcibly cool down the processor. Alarm
 may be raised, if the temperature grows enough (more than TjMax) to trigger
 the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
@@ -38,3 +38,104 @@ temp1_label	 - Contains string "Core X", where X is processor
 The TjMax temperature is set to 85 degrees C if undocumented model specific
 register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as
 (sometimes) documented in processor datasheet.
+Appendix A. Known TjMax lists (TBD):
+Some information comes from ark.intel.com
+Process         Processor                                       TjMax(C)
+32nm            Core i3/i5/i7 Processors
+                i7 660UM/640/620, 640LM/620, 620M, 610E         105
+                i5 540UM/520/430, 540M/520/450/430              105
+                i3 330E, 370M/350/330                           90 rPGA, 105 BGA
+                i3 330UM                                        105
+32nm            Core i7 Extreme Processors
+                980X                                            100
+32nm            Celeron Processors
+                U3400                                           105
+                P4505/P4500                                     90
+45nm            Xeon Processors 5400 Quad-Core
+                X5492, X5482, X5472, X5470, X5460, X5450        85
+                E5472, E5462, E5450/40/30/20/10/05              85
+                L5408                                           95
+                L5430, L5420, L5410                             70
+45nm            Xeon Processors 5200 Dual-Core
+                X5282, X5272, X5270, X5260                      90
+                E5240                                           90
+                E5205, E5220                                    70, 90
+                L5240                                           70
+                L5238, L5215                                    95
+45nm            Atom Processors
+                D525/510/425/410                                100
+                Z560/550/540/530P/530/520PT/520/515/510PT/510P  90
+                Z510/500                                        90
+                N475/470/455/450                                100
+                N280/270                                        90
+                330/230                                         125
+45nm            Core2 Processors
+                Solo ULV SU3500/3300                            100
+                T9900/9800/9600/9550/9500/9400/9300/8300/8100   105
+                T6670/6500/6400                                 105
+                T6600                                           90
+                SU9600/9400/9300                                105
+                SP9600/9400                                     105
+                SL9600/9400/9380/9300                           105
+                P9700/9600/9500/8800/8700/8600/8400/7570        105
+                P7550/7450                                      90
+45nm            Core2 Quad Processors
+                Q9100/9000                                      100
+45nm            Core2 Extreme Processors
+                X9100/9000                                      105
+                QX9300                                          100
+45nm            Core i3/i5/i7 Processors
+                i7 940XM/920                                    100
+                i7 840QM/820/740/720                            100
+45nm            Celeron Processors
+                SU2300                                          100
+                900                                             105
+65nm            Core2 Duo Processors
+                Solo U2200, U2100                               100
+                U7700/7600/7500                                 100
+                T7800/7700/7600/7500/7400/7300/7250/7200/7100   100
+                T5870/5670/5600/5550/5500/5470/5450/5300/5270   100
+                T5250                                           100
+                T5800/5750/5200                                 85
+                L7700/7500/7400/7300/7200                       100
+65nm            Core2 Extreme Processors
+                X7900/7800                                      100
+65nm            Core Duo Processors
+                U2500/2400                                      100
+                T2700/2600/2450/2400/2350/2300E/2300/2250/2050  100
+                L2500/2400/2300                                 100
+65nm            Core Solo Processors
+                U1500/1400/1300                                 100
+                T1400/1350/1300/1250                            100
+65nm            Xeon Processors 5000 Quad-Core
+                X5000                                           90-95
+                E5000                                           80
+                L5000                                           70
+                L5318                                           95
+65nm            Xeon Processors 5000 Dual-Core
+                5080, 5063, 5060, 5050, 5030                    80-90
+                5160, 5150, 5148, 5140, 5130, 5120, 5110        80
+                L5138                                           100
+65nm            Celeron Processors
+                T1700/1600                                      100
+                560/550/540/530                                 100
diff --git a/Documentation/hwmon/emc2103 b/Documentation/hwmon/emc2103
new file mode 100644
index 000000000000..a12b2c127140
--- /dev/null
+++ b/Documentation/hwmon/emc2103
@@ -0,0 +1,33 @@
+Kernel driver emc2103
+======================
+Supported chips:
+  * SMSC EMC2103
+    Addresses scanned: I2C 0x2e
+    Prefix: 'emc2103'
+    Datasheet: Not public
+Authors:
+        Steve Glendinning <steve.glendinning@smsc.com>
+Description
+-----------
+The Standard Microsystems Corporation (SMSC) EMC2103 chips
+contain up to 4 temperature sensors and a single fan controller.
+Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
+triggered if the rotation speed has dropped below a programmable limit. Fan
+readings can be divided by a programmable divider (1, 2, 4 or 8) to give
+the readings more range or accuracy. Not all RPM values can accurately be
+represented, so some rounding is done. With a divider of 1, the lowest
+representable value is 480 RPM.
+This driver supports RPM based control, to use this a fan target
+should be written to fan1_target and pwm1_enable should be set to 3.
+The 2103-2 and 2103-4 variants have a third temperature sensor, which can
+be connected to two anti-parallel diodes.  These values can be read
+as temp3 and temp4.  If only one diode is attached to this channel, temp4
+will show as "fault".  The module parameter "apd=0" can be used to suppress
+this 4th channel when anti-parallel diodes are not fitted.
diff --git a/Documentation/hwmon/f71882fg b/Documentation/hwmon/f71882fg
index a7952c2bd959..1a07fd674cd0 100644
--- a/Documentation/hwmon/f71882fg
+++ b/Documentation/hwmon/f71882fg
@@ -2,6 +2,10 @@ Kernel driver f71882fg
 ======================
 Supported chips:
+  * Fintek F71808E
+    Prefix: 'f71808fg'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheet: Not public
  * Fintek F71858FG
    Prefix: 'f71858fg'
    Addresses scanned: none, address read from Super I/O config space
diff --git a/Documentation/hwmon/g760a b/Documentation/hwmon/g760a
index e032eeb75629..cfc894537061 100644
--- a/Documentation/hwmon/g760a
+++ b/Documentation/hwmon/g760a
@@ -5,7 +5,7 @@ Supported chips:
  * Global Mixed-mode Technology Inc. G760A
    Prefix: 'g760a'
    Datasheet: Publicly available at the GMT website
-      http://www.gmt.com.tw/datasheet/g760a.pdf
+      http://www.gmt.com.tw/product/datasheet/EDS-760A.pdf
 Author: Herbert Valerio Riedel <hvr@gnu.org>
diff --git a/Documentation/hwmon/gl518sm b/Documentation/hwmon/gl518sm
index 229f8b789185..26f9f3c02dc7 100644
--- a/Documentation/hwmon/gl518sm
+++ b/Documentation/hwmon/gl518sm
@@ -5,11 +5,10 @@ Supported chips:
  * Genesys Logic GL518SM release 0x00
    Prefix: 'gl518sm'
    Addresses scanned: I2C 0x2c and 0x2d
-    Datasheet: http://www.genesyslogic.com/pdf
  * Genesys Logic GL518SM release 0x80
    Prefix: 'gl518sm'
    Addresses scanned: I2C 0x2c and 0x2d
-    Datasheet: http://www.genesyslogic.com/pdf
+    Datasheet: http://www.genesyslogic.com/
 Authors:
        Frodo Looijaard <frodol@dds.nl>,
diff --git a/Documentation/hwmon/hpfall.c b/Documentation/hwmon/hpfall.c
index 681ec22b9d0e..a4a8fc5d05d4 100644
--- a/Documentation/hwmon/hpfall.c
+++ b/Documentation/hwmon/hpfall.c
@@ -1,7 +1,7 @@
 /* Disk protection for HP machines.
 *
 * Copyright 2008 Eric Piel
- * Copyright 2009 Pavel Machek <pavel@suse.cz>
+ * Copyright 2009 Pavel Machek <pavel@ucw.cz>
 *
 * GPLv2.
 */
diff --git a/Documentation/hwmon/jc42 b/Documentation/hwmon/jc42
new file mode 100644
index 000000000000..0e76ef12e4c6
--- /dev/null
+++ b/Documentation/hwmon/jc42
@@ -0,0 +1,97 @@
+Kernel driver jc42
+==================
+Supported chips:
+  * Analog Devices ADT7408
+    Prefix: 'adt7408'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf
+  * IDT TSE2002B3, TS3000B3
+    Prefix: 'tse2002b3', 'ts3000b3'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://www.idt.com/products/getdoc.cfm?docid=18715691
+        http://www.idt.com/products/getdoc.cfm?docid=18715692
+  * Maxim MAX6604
+    Prefix: 'max6604'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf
+  * Microchip MCP9805, MCP98242, MCP98243, MCP9843
+    Prefixes: 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf
+        http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf
+        http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf
+  * NXP Semiconductors SE97, SE97B
+    Prefix: 'se97'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://www.nxp.com/documents/data_sheet/SE97.pdf
+        http://www.nxp.com/documents/data_sheet/SE97B.pdf
+  * NXP Semiconductors SE98
+    Prefix: 'se98'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://www.nxp.com/documents/data_sheet/SE98.pdf
+  * ON Semiconductor CAT34TS02, CAT6095
+    Prefix: 'cat34ts02', 'cat6095'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheet:
+        http://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF
+        http://www.onsemi.com/pub/Collateral/CAT6095-D.PDF
+  * ST Microelectronics STTS424, STTS424E02
+    Prefix: 'stts424'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheets:
+        http://www.st.com/stonline/products/literature/ds/13447/stts424.pdf
+        http://www.st.com/stonline/products/literature/ds/13448/stts424e02.pdf
+  * JEDEC JC 42.4 compliant temperature sensor chips
+    Prefix: 'jc42'
+    Addresses scanned: I2C 0x18 - 0x1f
+    Datasheet: -
+Author:
+        Guenter Roeck <guenter.roeck@ericsson.com>
+Description
+-----------
+This driver implements support for JEDEC JC 42.4 compliant temperature sensors.
+The driver auto-detects the chips listed above, but can be manually instantiated
+to support other JC 42.4 compliant chips.
+Example: the following will load the driver for a generic JC 42.4 compliant
+temperature sensor at address 0x18 on I2C bus #1:
+# modprobe jc42
+# echo jc42 0x18 > /sys/bus/i2c/devices/i2c-1/new_device
+A JC 42.4 compliant chip supports a single temperature sensor. Minimum, maximum,
+and critical temperature can be configured. There are alarms for high, low,
+and critical thresholds.
+There is also an hysteresis to control the thresholds for resetting alarms.
+Per JC 42.4 specification, the hysteresis threshold can be configured to 0, 1.5,
+3.0, and 6.0 degrees C. Configured hysteresis values will be rounded to those
+limits. The chip supports only a single register to configure the hysteresis,
+which applies to all limits. This register can be written by writing into
+temp1_crit_hyst. Other hysteresis attributes are read-only.
+Sysfs entries
+-------------
+temp1_input             Temperature (RO)
+temp1_min               Minimum temperature (RW)
+temp1_max               Maximum temperature (RW)
+temp1_crit              Critical high temperature (RW)
+temp1_crit_hyst         Critical hysteresis temperature (RW)
+temp1_max_hyst          Maximum hysteresis temperature (RO)
+temp1_min_alarm         Temperature low alarm
+temp1_max_alarm         Temperature high alarm
+temp1_crit_alarm        Temperature critical alarm
diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp
index 0005c7166146..716dc24c7237 100644
--- a/Documentation/hwmon/k8temp
+++ b/Documentation/hwmon/k8temp
@@ -5,7 +5,7 @@ Supported chips:
  * AMD Athlon64/FX or Opteron CPUs
    Prefix: 'k8temp'
    Addresses scanned: PCI space
-    Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
+    Datasheet: http://support.amd.com/us/Processor_TechDocs/32559.pdf
 Author: Rudolf Marek
 Contact: Rudolf Marek <r.marek@assembler.cz>
diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85
index a76aefeeb68a..b98e0e0d1910 100644
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
@@ -9,15 +9,15 @@ Supported chips:
  * Analog Devices ADM1027
    Prefix: 'adm1027'
    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
-    Datasheet: http://www.analog.com/en/prod/0,,766_825_ADM1027,00.html
+    Datasheet: http://www.onsemi.com/PowerSolutions/product.do?id=ADM1027
  * Analog Devices ADT7463
    Prefix: 'adt7463'
    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
-    Datasheet: http://www.analog.com/en/prod/0,,766_825_ADT7463,00.html
+    Datasheet: http://www.onsemi.com/PowerSolutions/product.do?id=ADT7463
  * SMSC EMC6D100, SMSC EMC6D101
    Prefix: 'emc6d100'
    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
-    Datasheet: http://www.smsc.com/main/tools/discontinued/6d100.pdf
+    Datasheet: http://www.smsc.com/media/Downloads_Public/discontinued/6d100.pdf 
  * SMSC EMC6D102
    Prefix: 'emc6d102'
    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
diff --git a/Documentation/hwmon/ltc4245 b/Documentation/hwmon/ltc4245
index 86b5880d8502..b478b0864965 100644
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
@@ -72,9 +72,31 @@ in6_min_alarm		5v  output undervoltage alarm
 in7_min_alarm           3v  output undervoltage alarm
 in8_min_alarm           Vee (-12v) output undervoltage alarm
-in9_input               GPIO voltage data
+in9_input               GPIO voltage data (see note 1)
+in10_input              GPIO voltage data (see note 1)
+in11_input              GPIO voltage data (see note 1)
 power1_input            12v power usage (mW)
 power2_input            5v  power usage (mW)
 power3_input            3v  power usage (mW)
 power4_input            Vee (-12v) power usage (mW)
+Note 1
+------
+If you have NOT configured the driver to sample all GPIO pins as analog
+voltages, then the in10_input and in11_input sysfs attributes will not be
+created. The driver will sample the GPIO pin that is currently connected to the
+ADC as an analog voltage, and report the value in in9_input.
+If you have configured the driver to sample all GPIO pins as analog voltages,
+then they will be sampled in round-robin fashion. If userspace reads too
+slowly, -EAGAIN will be returned when you read the sysfs attribute containing
+the sensor reading.
+The LTC4245 chip can be configured to sample all GPIO pins with two methods:
+1) platform data -- see include/linux/i2c/ltc4245.h
+2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip
+The default mode of operation is to sample a single GPIO pin.
diff --git a/Documentation/hwmon/pc87427 b/Documentation/hwmon/pc87427
index db5cc1227a83..8fdd08c9e48b 100644
--- a/Documentation/hwmon/pc87427
+++ b/Documentation/hwmon/pc87427
@@ -18,10 +18,11 @@ Description
 The National Semiconductor Super I/O chip includes complete hardware
 monitoring capabilities. It can monitor up to 18 voltages, 8 fans and
-6 temperature sensors. Only the fans are supported at the moment.
+6 temperature sensors. Only the fans and temperatures are supported at
+the moment, voltages aren't.
-This chip also has fan controlling features, which are not yet supported
+This chip also has fan controlling features (up to 4 PWM outputs),
-by this driver either.
+which are partly supported by this driver.
 The driver assumes that no more than one chip is present, which seems
 reasonable.
@@ -36,3 +37,23 @@ signal. Speeds down to 83 RPM can be measured.
 An alarm is triggered if the rotation speed drops below a programmable
 limit. Another alarm is triggered if the speed is too low to be measured
 (including stalled or missing fan).
+Fan Speed Control
+-----------------
+Fan speed can be controlled by PWM outputs. There are 4 possible modes:
+always off, always on, manual and automatic. The latter isn't supported
+by the driver: you can only return to that mode if it was the original
+setting, and the configuration interface is missing.
+Temperature Monitoring
+----------------------
+The PC87427 relies on external sensors (following the SensorPath
+standard), so the resolution and range depend on the type of sensor
+connected. The integer part can be 8-bit or 9-bit, and can be signed or
+not. I couldn't find a way to figure out the external sensor data
+temperature format, so user-space adjustment (typically by a factor 2)
+may be required.
diff --git a/Documentation/hwmon/pkgtemp b/Documentation/hwmon/pkgtemp
new file mode 100644
index 000000000000..c8e1fb0fadd3
--- /dev/null
+++ b/Documentation/hwmon/pkgtemp
@@ -0,0 +1,36 @@
+Kernel driver pkgtemp
+======================
+Supported chips:
+  * Intel family
+    Prefix: 'pkgtemp'
+    CPUID:
+    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual
+               Volume 3A: System Programming Guide
+Author: Fenghua Yu
+Description
+-----------
+This driver permits reading package level temperature sensor embedded inside
+Intel CPU package. The sensors can be in core, uncore, memory controller, or
+other components in a package. The feature is first implemented in Intel Sandy
+Bridge platform.
+Temperature is measured in degrees Celsius and measurement resolution is
+1 degree C. Valid temperatures are from 0 to TjMax degrees C, because the actual
+value of temperature register is in fact a delta from TjMax.
+Temperature known as TjMax is the maximum junction temperature of package.
+We get this from MSR_IA32_TEMPERATURE_TARGET. If the MSR is not accessible,
+we define TjMax as 100 degrees Celsius. At this temperature, protection
+mechanism will perform actions to forcibly cool down the package. Alarm
+may be raised, if the temperature grows enough (more than TjMax) to trigger
+the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
+temp1_input       - Package temperature (in millidegrees Celsius).
+temp1_max        - All cooling devices should be turned on.
+temp1_crit        - Maximum junction temperature (in millidegrees Celsius).
+temp1_crit_alarm - Set when Out-of-spec bit is set, never clears.
+                    Correct CPU operation is no longer guaranteed.
diff --git a/Documentation/hwmon/smm665 b/Documentation/hwmon/smm665
new file mode 100644
index 000000000000..3820fc9ca52d
--- /dev/null
+++ b/Documentation/hwmon/smm665
@@ -0,0 +1,157 @@
+Kernel driver smm665
+====================
+Supported chips:
+  * Summit Microelectronics SMM465
+    Prefix: 'smm465'
+    Addresses scanned: -
+    Datasheet:
+      http://www.summitmicro.com/prod_select/summary/SMM465/SMM465DS.pdf
+  * Summit Microelectronics SMM665, SMM665B
+    Prefix: 'smm665'
+    Addresses scanned: -
+    Datasheet:
+      http://www.summitmicro.com/prod_select/summary/SMM665/SMM665B_2089_20.pdf
+  * Summit Microelectronics SMM665C
+    Prefix: 'smm665c'
+    Addresses scanned: -
+    Datasheet:
+      http://www.summitmicro.com/prod_select/summary/SMM665C/SMM665C_2125.pdf
+  * Summit Microelectronics SMM764
+    Prefix: 'smm764'
+    Addresses scanned: -
+    Datasheet:
+      http://www.summitmicro.com/prod_select/summary/SMM764/SMM764_2098.pdf
+  * Summit Microelectronics SMM766, SMM766B
+    Prefix: 'smm766'
+    Addresses scanned: -
+    Datasheets:
+      http://www.summitmicro.com/prod_select/summary/SMM766/SMM766_2086.pdf
+      http://www.summitmicro.com/prod_select/summary/SMM766B/SMM766B_2122.pdf
+Author: Guenter Roeck <guenter.roeck@ericsson.com>
+Module Parameters
+-----------------
+* vref: int
+  Default: 1250 (mV)
+  Reference voltage on VREF_ADC pin in mV. It should not be necessary to set
+  this parameter unless a non-default reference voltage is used.
+Description
+-----------
+[From datasheet] The SMM665 is an Active DC Output power supply Controller
+that monitors, margins and cascade sequences power. The part monitors six
+power supply channels as well as VDD, 12V input, two general-purpose analog
+inputs and an internal temperature sensor using a 10-bit ADC.
+Each monitored channel has its own high and low limits, plus a critical
+limit.
+Support for SMM465, SMM764, and SMM766 has been implemented but is untested.
+Usage Notes
+-----------
+This driver does not probe for devices, since there is no register which
+can be safely used to identify the chip. You will have to instantiate
+the devices explicitly. When instantiating the device, you have to specify
+its configuration register address.
+Example: the following will load the driver for an SMM665 at address 0x57
+on I2C bus #1:
+$ modprobe smm665
+$ echo smm665 0x57 > /sys/bus/i2c/devices/i2c-1/new_device
+Sysfs entries
+-------------
+This driver uses the values in the datasheet to convert ADC register values
+into the values specified in the sysfs-interface document. All attributes are
+read only.
+Min, max, lcrit, and crit values are used by the chip to trigger external signals
+and/or other activity. Triggered signals can include HEALTHY, RST, Power Off,
+or Fault depending on the chip configuration. The driver reports values as lcrit
+or crit if exceeding the limits triggers RST, Power Off, or Fault, and as min or
+max otherwise. For details please see the SMM665 datasheet.
+For SMM465 and SMM764, values for Channel E and F are reported but undefined.
+in1_input               12V input voltage (mV)
+in2_input               3.3V (VDD) input voltage (mV)
+in3_input               Channel A voltage (mV)
+in4_input               Channel B voltage (mV)
+in5_input               Channel C voltage (mV)
+in6_input               Channel D voltage (mV)
+in7_input               Channel E voltage (mV)
+in8_input               Channel F voltage (mV)
+in9_input               AIN1 voltage (mV)
+in10_input              AIN2 voltage (mV)
+in1_min                 12v input minimum voltage (mV)
+in2_min                 3.3V (VDD) input minimum voltage (mV)
+in3_min                 Channel A minimum voltage (mV)
+in4_min                 Channel B minimum voltage (mV)
+in5_min                 Channel C minimum voltage (mV)
+in6_min                 Channel D minimum voltage (mV)
+in7_min                 Channel E minimum voltage (mV)
+in8_min                 Channel F minimum voltage (mV)
+in9_min                 AIN1 minimum voltage (mV)
+in10_min                AIN2 minimum voltage (mV)
+in1_max                 12v input maximum voltage (mV)
+in2_max                 3.3V (VDD) input maximum voltage (mV)
+in3_max                 Channel A maximum voltage (mV)
+in4_max                 Channel B maximum voltage (mV)
+in5_max                 Channel C maximum voltage (mV)
+in6_max                 Channel D maximum voltage (mV)
+in7_max                 Channel E maximum voltage (mV)
+in8_max                 Channel F maximum voltage (mV)
+in9_max                 AIN1 maximum voltage (mV)
+in10_max                AIN2 maximum voltage (mV)
+in1_lcrit               12v input critical minimum voltage (mV)
+in2_lcrit               3.3V (VDD) input critical minimum voltage (mV)
+in3_lcrit               Channel A critical minimum voltage (mV)
+in4_lcrit               Channel B critical minimum voltage (mV)
+in5_lcrit               Channel C critical minimum voltage (mV)
+in6_lcrit               Channel D critical minimum voltage (mV)
+in7_lcrit               Channel E critical minimum voltage (mV)
+in8_lcrit               Channel F critical minimum voltage (mV)
+in9_lcrit               AIN1 critical minimum voltage (mV)
+in10_lcrit              AIN2 critical minimum voltage (mV)
+in1_crit                12v input critical maximum voltage (mV)
+in2_crit                3.3V (VDD) input critical maximum voltage (mV)
+in3_crit                Channel A critical maximum voltage (mV)
+in4_crit                Channel B critical maximum voltage (mV)
+in5_crit                Channel C critical maximum voltage (mV)
+in6_crit                Channel D critical maximum voltage (mV)
+in7_crit                Channel E critical maximum voltage (mV)
+in8_crit                Channel F critical maximum voltage (mV)
+in9_crit                AIN1 critical maximum voltage (mV)
+in10_crit               AIN2 critical maximum voltage (mV)
+in1_crit_alarm          12v input critical alarm
+in2_crit_alarm          3.3V (VDD) input critical alarm
+in3_crit_alarm          Channel A critical alarm
+in4_crit_alarm          Channel B critical alarm
+in5_crit_alarm          Channel C critical alarm
+in6_crit_alarm          Channel D critical alarm
+in7_crit_alarm          Channel E critical alarm
+in8_crit_alarm          Channel F critical alarm
+in9_crit_alarm          AIN1 critical alarm
+in10_crit_alarm         AIN2 critical alarm
+temp1_input             Chip tempererature
+temp1_min               Mimimum chip tempererature
+temp1_max               Maximum chip tempererature
+temp1_crit              Critical chip tempererature
+temp1_crit_alarm        Temperature critical alarm
diff --git a/Documentation/hwmon/smsc47m1 b/Documentation/hwmon/smsc47m1
index 42c8431b3c9d..2a13378dcf22 100644
--- a/Documentation/hwmon/smsc47m1
+++ b/Documentation/hwmon/smsc47m1
@@ -7,13 +7,10 @@ Supported chips:
    Addresses scanned: none, address read from Super I/O config space
    Prefix: 'smsc47m1'
    Datasheets:
-        http://www.smsc.com/main/datasheets/47b27x.pdf
+        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47b272.pdf
-        http://www.smsc.com/main/datasheets/47m10x.pdf
+        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m10x.pdf
-        http://www.smsc.com/main/datasheets/47m112.pdf
+        http://www.smsc.com/media/Downloads_Public/Data_Sheets/47m112.pdf
-        http://www.smsc.com/main/tools/discontinued/47m13x.pdf
+        http://www.smsc.com/
-        http://www.smsc.com/main/datasheets/47m14x.pdf
-        http://www.smsc.com/main/tools/discontinued/47m15x.pdf
-        http://www.smsc.com/main/datasheets/47m192.pdf
  * SMSC LPC47M292
    Addresses scanned: none, address read from Super I/O config space
    Prefix: 'smsc47m2'
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index d4e2917c6f18..ff45d1f837c8 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -107,10 +107,24 @@ in[0-*]_min	Voltage min value.
                Unit: millivolt
                RW
                
+in[0-*]_lcrit   Voltage critical min value.
+                Unit: millivolt
+                RW
+                If voltage drops to or below this limit, the system may
+                take drastic action such as power down or reset. At the very
+                least, it should report a fault.
 in[0-*]_max     Voltage max value.
                Unit: millivolt
                RW
                
+in[0-*]_crit    Voltage critical max value.
+                Unit: millivolt
+                RW
+                If voltage reaches or exceeds this limit, the system may
+                take drastic action such as power down or reset. At the very
+                least, it should report a fault.
 in[0-*]_input   Voltage input value.
                Unit: millivolt
                RO
@@ -284,7 +298,7 @@ temp[1-*]_input Temperature input value.
                Unit: millidegree Celsius
                RO
-temp[1-*]_crit  Temperature critical value, typically greater than
+temp[1-*]_crit  Temperature critical max value, typically greater than
                corresponding temp_max values.
                Unit: millidegree Celsius
                RW
@@ -296,6 +310,11 @@ temp[1-*]_crit_hyst
                from the critical value.
                RW
+temp[1-*]_lcrit Temperature critical min value, typically lower than
+                corresponding temp_min values.
+                Unit: millidegree Celsius
+                RW
 temp[1-*]_offset
                Temperature offset which is added to the temperature reading
                by the chip.
@@ -344,9 +363,6 @@ Also see the Alarms section for status flags associated with temperatures.
 * Currents *
 ************
-Note that no known chip provides current measurements as of writing,
-so this part is theoretical, so to say.
 curr[1-*]_max   Current max value
                Unit: milliampere
                RW
@@ -471,6 +487,7 @@ limit-related alarms, not both. The driver should just reflect the hardware
 implementation.
 in[0-*]_alarm
+curr[1-*]_alarm
 fan[1-*]_alarm
 temp[1-*]_alarm
                Channel alarm
@@ -482,6 +499,8 @@ OR
 in[0-*]_min_alarm
 in[0-*]_max_alarm
+curr[1-*]_min_alarm
+curr[1-*]_max_alarm
 fan[1-*]_min_alarm
 fan[1-*]_max_alarm
 temp[1-*]_min_alarm
@@ -497,7 +516,6 @@ to notify open diodes, unconnected fans etc. where the hardware
 supports it. When this boolean has value 1, the measurement for that
 channel should not be trusted.
-in[0-*]_fault
 fan[1-*]_fault
 temp[1-*]_fault
                Input fault condition
@@ -513,6 +531,7 @@ beep_enable	Master beep enable
                RW
 in[0-*]_beep
+curr[1-*]_beep
 fan[1-*]_beep
 temp[1-*]_beep
                Channel beep
diff --git a/Documentation/hwmon/thmc50 b/Documentation/hwmon/thmc50
index 9639ca93d559..8a7772ade8d0 100644
--- a/Documentation/hwmon/thmc50
+++ b/Documentation/hwmon/thmc50
@@ -9,7 +9,7 @@ Supported chips:
  * Texas Instruments THMC50
    Prefix: 'thmc50'
    Addresses scanned: I2C 0x2c - 0x2e
-    Datasheet: http://focus.ti.com/docs/prod/folders/print/thmc50.html
+    Datasheet: http://www.ti.com/ 
 Author: Krzysztof Helt <krzysztof.h1@wp.pl>
diff --git a/Documentation/hwmon/via686a b/Documentation/hwmon/via686a
index d651b25f7519..e5f90ab5c48d 100644
--- a/Documentation/hwmon/via686a
+++ b/Documentation/hwmon/via686a
@@ -5,7 +5,7 @@ Supported chips:
  * Via VT82C686A, VT82C686B  Southbridge Integrated Hardware Monitor
    Prefix: 'via686a'
    Addresses scanned: ISA in PCI-space encoded address
-    Datasheet: On request through web form (http://www.via.com.tw/en/support/datasheets/)
+    Datasheet: On request through web form (http://www.via.com.tw/en/resources/download-center/)
 Authors:
        Kyösti Mälkki <kmalkki@cc.hut.fi>,
diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
index b7e42ec4b26b..13d556112fc0 100644
--- a/Documentation/hwmon/w83627ehf
+++ b/Documentation/hwmon/w83627ehf
@@ -20,6 +20,10 @@ Supported chips:
    Prefix: 'w83667hg'
    Addresses scanned: ISA address retrieved from Super I/O registers
    Datasheet: not available
+  * Winbond W83667HG-B
+    Prefix: 'w83667hg'
+    Addresses scanned: ISA address retrieved from Super I/O registers
+    Datasheet: Available from Nuvoton upon request
 Authors:
        Jean Delvare <khali@linux-fr.org>
@@ -32,8 +36,8 @@ Description
 -----------
 This driver implements support for the Winbond W83627EHF, W83627EHG,
-W83627DHG, W83627DHG-P and W83667HG super I/O chips. We will refer to them
+W83627DHG, W83627DHG-P, W83667HG and W83667HG-B super I/O chips.
-collectively as Winbond chips.
+We will refer to them collectively as Winbond chips.
 The chips implement three temperature sensors, five fan rotation
 speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
@@ -68,14 +72,15 @@ follows:
 temp1 -> pwm1
 temp2 -> pwm2
 temp3 -> pwm3
-prog  -> pwm4 (not on 667HG; the programmable setting is not supported by
+prog  -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not
-               the driver)
+               supported by the driver)
 /sys files
 ----------
 name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
-       it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg"
+       it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg",
+       and for the W83667HG it is set to "w83667hg".
 pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
           0 (stop) to 255 (full)
diff --git a/Documentation/hwmon/w83627hf b/Documentation/hwmon/w83627hf
index 44dd2bcc72bd..fb145e5e722a 100644
--- a/Documentation/hwmon/w83627hf
+++ b/Documentation/hwmon/w83627hf
@@ -5,23 +5,19 @@ Supported chips:
  * Winbond W83627HF (ISA accesses ONLY)
    Prefix: 'w83627hf'
    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: http://www.winbond.com/PDF/sheet/w83627hf.pdf
  * Winbond W83627THF
    Prefix: 'w83627thf'
    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: http://www.winbond.com/PDF/sheet/w83627thf.pdf
  * Winbond W83697HF
    Prefix: 'w83697hf'
    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: http://www.winbond.com/PDF/sheet/697hf.pdf
  * Winbond W83637HF
    Prefix: 'w83637hf'
    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf
  * Winbond W83687THF
    Prefix: 'w83687thf'
    Addresses scanned: ISA address retrieved from Super I/O registers
-    Datasheet: Provided by Winbond on request
+    Datasheet: Provided by Winbond on request(http://www.winbond.com/hq/enu)
 Authors:
        Frodo Looijaard <frodol@dds.nl>,
diff --git a/Documentation/hwmon/w83781d b/Documentation/hwmon/w83781d
index c91e0b63ea1d..ecbc1e4574b4 100644
--- a/Documentation/hwmon/w83781d
+++ b/Documentation/hwmon/w83781d
@@ -9,7 +9,7 @@ Supported chips:
  * Winbond W83782D
    Prefix: 'w83782d'
    Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)
-    Datasheet: http://www.winbond.com/PDF/sheet/w83782d.pdf
+    Datasheet: http://www.winbond.com
  * Winbond W83783S
    Prefix: 'w83783s'
    Addresses scanned: I2C 0x2d
diff --git a/Documentation/hwmon/w83792d b/Documentation/hwmon/w83792d
index 14a668ed8aaa..8a023ce0b72e 100644
--- a/Documentation/hwmon/w83792d
+++ b/Documentation/hwmon/w83792d
@@ -5,7 +5,7 @@ Supported chips:
  * Winbond W83792D
    Prefix: 'w83792d'
    Addresses scanned: I2C 0x2c - 0x2f
-    Datasheet: http://www.winbond.com.tw/E-WINBONDHTM/partner/PDFresult.asp?Pname=1035
+    Datasheet: http://www.winbond.com.tw
 Author: Chunhao Huang
 Contact: DZShen <DZShen@Winbond.com.tw>
diff --git a/Documentation/i2c/busses/i2c-ali1535 b/Documentation/i2c/busses/i2c-ali1535
index acbc65a08097..5d46342e486a 100644
--- a/Documentation/i2c/busses/i2c-ali1535
+++ b/Documentation/i2c/busses/i2c-ali1535
@@ -3,7 +3,7 @@ Kernel driver i2c-ali1535
 Supported adapters:
  * Acer Labs, Inc. ALI 1535 (south bridge)
    Datasheet: Now under NDA
-        http://www.ali.com.tw/eng/support/datasheet_request.php
+        http://www.ali.com.tw/
 Authors:
        Frodo Looijaard <frodol@dds.nl>,
diff --git a/Documentation/i2c/busses/i2c-ali1563 b/Documentation/i2c/busses/i2c-ali1563
index 54691698d2dd..41b1a077e4c7 100644
--- a/Documentation/i2c/busses/i2c-ali1563
+++ b/Documentation/i2c/busses/i2c-ali1563
@@ -3,7 +3,7 @@ Kernel driver i2c-ali1563
 Supported adapters:
  * Acer Labs, Inc. ALI 1563 (south bridge)
    Datasheet: Now under NDA
-        http://www.ali.com.tw/eng/support/datasheet_request.php
+        http://www.ali.com.tw/
 Author: Patrick Mochel <mochel@digitalimplant.org>
diff --git a/Documentation/i2c/busses/i2c-ali15x3 b/Documentation/i2c/busses/i2c-ali15x3
index 600da90b8f12..42888d8ac124 100644
--- a/Documentation/i2c/busses/i2c-ali15x3
+++ b/Documentation/i2c/busses/i2c-ali15x3
@@ -3,7 +3,7 @@ Kernel driver i2c-ali15x3
 Supported adapters:
  * Acer Labs, Inc. ALI 1533 and 1543C (south bridge)
    Datasheet: Now under NDA
-        http://www.ali.com.tw/eng/support/datasheet_request.php
+        http://www.ali.com.tw/
 Authors:
        Frodo Looijaard <frodol@dds.nl>,
diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4
index ac540c71c7eb..475bb4ae0720 100644
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
@@ -97,4 +97,4 @@ of all affected systems, so the only safe solution was to prevent access to
 the SMBus on all IBM systems (detected using DMI data.)
 For additional information, read:
-http://www.lm-sensors.org/browser/lm-sensors/trunk/README.thinkpad
+http://www.lm-sensors.org/browser/lm-sensors/trunk/README
diff --git a/Documentation/i2c/busses/i2c-sis630 b/Documentation/i2c/busses/i2c-sis630
index 629ea2c356fd..0b9697366930 100644
--- a/Documentation/i2c/busses/i2c-sis630
+++ b/Documentation/i2c/busses/i2c-sis630
@@ -2,7 +2,7 @@ Kernel driver i2c-sis630
 Supported adapters:
  * Silicon Integrated Systems Corp (SiS)
-        630 chipset (Datasheet: available at http://amalysh.bei.t-online.de/docs/SIS/)
+        630 chipset (Datasheet: available at http://www.sfr-fresh.com/linux)
        730 chipset
  * Possible other SiS chipsets ?
diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices
index e89490270aba..87da405a8597 100644
--- a/Documentation/i2c/instantiating-devices
+++ b/Documentation/i2c/instantiating-devices
@@ -102,7 +102,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev)
        memset(&i2c_info, 0, sizeof(struct i2c_board_info));
        strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE);
        isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info,
-                                                   normal_i2c);
+                                                   normal_i2c, NULL);
        i2c_put_adapter(i2c_adap);
        (...)
 }
diff --git a/Documentation/ia64/aliasing.txt b/Documentation/ia64/aliasing.txt
index aa3e953f0f7b..5a4dea6abebd 100644
--- a/Documentation/ia64/aliasing.txt
+++ b/Documentation/ia64/aliasing.txt
@@ -168,8 +168,6 @@ PAST PROBLEM CASES
    mmap of 0x0-0x9FFFF /dev/mem by "hwinfo" on HP sx1000 with VGA enabled
-      See https://bugzilla.novell.com/show_bug.cgi?id=140858.
      The EFI memory map reports the following attributes:
        0x00000-0x9FFFF WB only
        0xA0000-0xBFFFF UC only (VGA frame buffer)
diff --git a/Documentation/ia64/serial.txt b/Documentation/ia64/serial.txt
index 040b9773209f..6869c73de4e2 100644
--- a/Documentation/ia64/serial.txt
+++ b/Documentation/ia64/serial.txt
@@ -133,7 +133,7 @@ TROUBLESHOOTING SERIAL CONSOLE PROBLEMS
-[1] http://www.dig64.org/specifications/DIG64_PCDPv20.pdf
+[1] http://www.dig64.org/specifications/agreement 
    The table was originally defined as the "HCDP" for "Headless
    Console/Debug Port."  The current version is the "PCDP" for
    "Primary Console and Debug Port Devices."
diff --git a/Documentation/infiniband/user_verbs.txt b/Documentation/infiniband/user_verbs.txt
index afe3f8da9018..e5092d696da2 100644
--- a/Documentation/infiniband/user_verbs.txt
+++ b/Documentation/infiniband/user_verbs.txt
@@ -5,7 +5,7 @@ USERSPACE VERBS ACCESS
  described in chapter 11 of the InfiniBand Architecture Specification.
  To use the verbs, the libibverbs library, available from
-  <http://openib.org/>, is required.  libibverbs contains a
+  http://www.openfabrics.org/, is required.  libibverbs contains a
  device-independent API for using the ib_uverbs interface.
  libibverbs also requires appropriate device-dependent kernel and
  userspace driver for your InfiniBand hardware.  For example, to use
diff --git a/Documentation/input/appletouch.txt b/Documentation/input/appletouch.txt
index 4f7c633a76d2..b13de3f89108 100644
--- a/Documentation/input/appletouch.txt
+++ b/Documentation/input/appletouch.txt
@@ -82,4 +82,4 @@ Links:
 ------
 [1]: http://johannes.sipsolutions.net/PowerBook/touchpad/
-[2]: http://web.telia.com/~u89404340/touchpad/index.html
+[2]: http://web.archive.org/web/*/http://web.telia.com/~u89404340/touchpad/index.html
diff --git a/Documentation/input/bcm5974.txt b/Documentation/input/bcm5974.txt
index 5e22dcf6d48d..74d3876d6f34 100644
--- a/Documentation/input/bcm5974.txt
+++ b/Documentation/input/bcm5974.txt
@@ -62,4 +62,4 @@ Links
 -----
 [1] http://ubuntuforums.org/showthread.php?t=840040
-[2] http://http://bitmath.org/code/
+[2] http://bitmath.org/code/
diff --git a/Documentation/input/iforce-protocol.txt b/Documentation/input/iforce-protocol.txt
index 3ac92413c874..2d5fbfd6023e 100644
--- a/Documentation/input/iforce-protocol.txt
+++ b/Documentation/input/iforce-protocol.txt
@@ -251,7 +251,7 @@ Check www.immerse.com for Immersion Studio, and www.fcoder.com for ComPortSpy.
 ** Author of this document **
 Johann Deneux <johann.deneux@gmail.com>
-Home page at http://www.esil.univ-mrs.fr/~jdeneux/projects/ff/
+Home page at http://web.archive.org/web/*/http://www.esil.univ-mrs.fr
 Additions by Vojtech Pavlik.
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt
index c0fc1c75fd88..bdcba154b83e 100644
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
@@ -6,31 +6,149 @@ Multi-touch (MT) Protocol
 Introduction
 ------------
-In order to utilize the full power of the new multi-touch devices, a way to
+In order to utilize the full power of the new multi-touch and multi-user
-report detailed finger data to user space is needed. This document
+devices, a way to report detailed data from multiple contacts, i.e.,
-describes the multi-touch (MT) protocol which allows kernel drivers to
+objects in direct contact with the device surface, is needed.  This
-report details for an arbitrary number of fingers.
+document describes the multi-touch (MT) protocol which allows kernel
+drivers to report details for an arbitrary number of contacts.
+The protocol is divided into two types, depending on the capabilities of the
+hardware. For devices handling anonymous contacts (type A), the protocol
+describes how to send the raw data for all contacts to the receiver. For
+devices capable of tracking identifiable contacts (type B), the protocol
+describes how to send updates for individual contacts via event slots.
+Protocol Usage
+--------------
+Contact details are sent sequentially as separate packets of ABS_MT
+events. Only the ABS_MT events are recognized as part of a contact
+packet. Since these events are ignored by current single-touch (ST)
+applications, the MT protocol can be implemented on top of the ST protocol
+in an existing driver.
+Drivers for type A devices separate contact packets by calling
+input_mt_sync() at the end of each packet. This generates a SYN_MT_REPORT
+event, which instructs the receiver to accept the data for the current
+contact and prepare to receive another.
+Drivers for type B devices separate contact packets by calling
+input_mt_slot(), with a slot as argument, at the beginning of each packet.
+This generates an ABS_MT_SLOT event, which instructs the receiver to
+prepare for updates of the given slot.
+All drivers mark the end of a multi-touch transfer by calling the usual
+input_sync() function. This instructs the receiver to act upon events
+accumulated since last EV_SYN/SYN_REPORT and prepare to receive a new set
+of events/packets.
+The main difference between the stateless type A protocol and the stateful
+type B slot protocol lies in the usage of identifiable contacts to reduce
+the amount of data sent to userspace. The slot protocol requires the use of
+the ABS_MT_TRACKING_ID, either provided by the hardware or computed from
+the raw data [5].
+For type A devices, the kernel driver should generate an arbitrary
+enumeration of the full set of anonymous contacts currently on the
+surface. The order in which the packets appear in the event stream is not
+important.  Event filtering and finger tracking is left to user space [3].
+For type B devices, the kernel driver should associate a slot with each
+identified contact, and use that slot to propagate changes for the contact.
+Creation, replacement and destruction of contacts is achieved by modifying
+the ABS_MT_TRACKING_ID of the associated slot.  A non-negative tracking id
+is interpreted as a contact, and the value -1 denotes an unused slot.  A
+tracking id not previously present is considered new, and a tracking id no
+longer present is considered removed.  Since only changes are propagated,
+the full state of each initiated contact has to reside in the receiving
+end.  Upon receiving an MT event, one simply updates the appropriate
+attribute of the current slot.
+Protocol Example A
+------------------
+Here is what a minimal event sequence for a two-contact touch would look
+like for a type A device:
+   ABS_MT_POSITION_X x[0]
+   ABS_MT_POSITION_Y y[0]
+   SYN_MT_REPORT
+   ABS_MT_POSITION_X x[1]
+   ABS_MT_POSITION_Y y[1]
+   SYN_MT_REPORT
+   SYN_REPORT
+The sequence after moving one of the contacts looks exactly the same; the
+raw data for all present contacts are sent between every synchronization
+with SYN_REPORT.
-Usage
+Here is the sequence after lifting the first contact:
-----
+   ABS_MT_POSITION_X x[1]
+   ABS_MT_POSITION_Y y[1]
+   SYN_MT_REPORT
+   SYN_REPORT
+And here is the sequence after lifting the second contact:
+   SYN_MT_REPORT
+   SYN_REPORT
+If the driver reports one of BTN_TOUCH or ABS_PRESSURE in addition to the
+ABS_MT events, the last SYN_MT_REPORT event may be omitted. Otherwise, the
+last SYN_REPORT will be dropped by the input core, resulting in no
+zero-contact event reaching userland.
-Anonymous finger details are sent sequentially as separate packets of ABS
-events. Only the ABS_MT events are recognized as part of a finger
+Protocol Example B
-packet. The end of a packet is marked by calling the input_mt_sync()
+------------------
-function, which generates a SYN_MT_REPORT event. This instructs the
-receiver to accept the data for the current finger and prepare to receive
+Here is what a minimal event sequence for a two-contact touch would look
-another. The end of a multi-touch transfer is marked by calling the usual
+like for a type B device:
-input_sync() function. This instructs the receiver to act upon events
-accumulated since last EV_SYN/SYN_REPORT and prepare to receive a new
+   ABS_MT_SLOT 0
-set of events/packets.
+   ABS_MT_TRACKING_ID 45
+   ABS_MT_POSITION_X x[0]
+   ABS_MT_POSITION_Y y[0]
+   ABS_MT_SLOT 1
+   ABS_MT_TRACKING_ID 46
+   ABS_MT_POSITION_X x[1]
+   ABS_MT_POSITION_Y y[1]
+   SYN_REPORT
+Here is the sequence after moving contact 45 in the x direction:
+   ABS_MT_SLOT 0
+   ABS_MT_POSITION_X x[0]
+   SYN_REPORT
+Here is the sequence after lifting the contact in slot 0:
+   ABS_MT_TRACKING_ID -1
+   SYN_REPORT
+The slot being modified is already 0, so the ABS_MT_SLOT is omitted.  The
+message removes the association of slot 0 with contact 45, thereby
+destroying contact 45 and freeing slot 0 to be reused for another contact.
+Finally, here is the sequence after lifting the second contact:
+   ABS_MT_SLOT 1
+   ABS_MT_TRACKING_ID -1
+   SYN_REPORT
+Event Usage
+-----------
 A set of ABS_MT events with the desired properties is defined. The events
 are divided into categories, to allow for partial implementation.  The
 minimum set consists of ABS_MT_POSITION_X and ABS_MT_POSITION_Y, which
-allows for multiple fingers to be tracked.  If the device supports it, the
+allows for multiple contacts to be tracked.  If the device supports it, the
 ABS_MT_TOUCH_MAJOR and ABS_MT_WIDTH_MAJOR may be used to provide the size
-of the contact area and approaching finger, respectively.
+of the contact area and approaching contact, respectively.
 The TOUCH and WIDTH parameters have a geometrical interpretation; imagine
 looking through a window at someone gently holding a finger against the
@@ -41,56 +159,26 @@ ABS_MT_TOUCH_MAJOR, the diameter of the outer region is
 ABS_MT_WIDTH_MAJOR. Now imagine the person pressing the finger harder
 against the glass. The inner region will increase, and in general, the
 ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR, which is always smaller than
-unity, is related to the finger pressure. For pressure-based devices,
+unity, is related to the contact pressure. For pressure-based devices,
 ABS_MT_PRESSURE may be used to provide the pressure on the contact area
 instead.
-In addition to the MAJOR parameters, the oval shape of the finger can be
+In addition to the MAJOR parameters, the oval shape of the contact can be
 described by adding the MINOR parameters, such that MAJOR and MINOR are the
 major and minor axis of an ellipse. Finally, the orientation of the oval
 shape can be describe with the ORIENTATION parameter.
 The ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a
-finger or a pen or something else.  Devices with more granular information
+contact or a pen or something else.  Devices with more granular information
 may specify general shapes as blobs, i.e., as a sequence of rectangular
 shapes grouped together by an ABS_MT_BLOB_ID. Finally, for the few devices
 that currently support it, the ABS_MT_TRACKING_ID event may be used to
-report finger tracking from hardware [5].
+report contact tracking from hardware [5].
-Here is what a minimal event sequence for a two-finger touch would look
-like:
-   ABS_MT_POSITION_X
-   ABS_MT_POSITION_Y
-   SYN_MT_REPORT
-   ABS_MT_POSITION_X
-   ABS_MT_POSITION_Y
-   SYN_MT_REPORT
-   SYN_REPORT
-Here is the sequence after lifting one of the fingers:
-   ABS_MT_POSITION_X
-   ABS_MT_POSITION_Y
-   SYN_MT_REPORT
-   SYN_REPORT
-And here is the sequence after lifting the remaining finger:
-   SYN_MT_REPORT
-   SYN_REPORT
-If the driver reports one of BTN_TOUCH or ABS_PRESSURE in addition to the
-ABS_MT events, the last SYN_MT_REPORT event may be omitted. Otherwise, the
-last SYN_REPORT will be dropped by the input core, resulting in no
-zero-finger event reaching userland.
 Event Semantics
 ---------------
-The word "contact" is used to describe a tool which is in direct contact
-with the surface. A finger, a pen or a rubber all classify as contacts.
 ABS_MT_TOUCH_MAJOR
 The length of the major axis of the contact. The length should be given in
@@ -157,15 +245,16 @@ MT_TOOL_PEN [2].
 ABS_MT_BLOB_ID
 The BLOB_ID groups several packets together into one arbitrarily shaped
-contact. This is a low-level anonymous grouping, and should not be confused
+contact. This is a low-level anonymous grouping for type A devices, and
-with the high-level trackingID [5]. Most kernel drivers will not have blob
+should not be confused with the high-level trackingID [5]. Most type A
-capability, and can safely omit the event.
+devices do not have blob capability, so drivers can safely omit this event.
 ABS_MT_TRACKING_ID
 The TRACKING_ID identifies an initiated contact throughout its life cycle
-[5]. There are currently only a few devices that support it, so this event
+[5]. This event is mandatory for type B devices. The value range of the
-should normally be omitted.
+TRACKING_ID should be large enough to ensure unique identification of a
+contact maintained over an extended period of time.
 Event Computation
@@ -192,20 +281,11 @@ finger along the X axis (1).
 Finger Tracking
 ---------------
-The kernel driver should generate an arbitrary enumeration of the set of
-anonymous contacts currently on the surface. The order in which the packets
-appear in the event stream is not important.
 The process of finger tracking, i.e., to assign a unique trackingID to each
-initiated contact on the surface, is left to user space; preferably the
+initiated contact on the surface, is a Euclidian Bipartite Matching
-multi-touch X driver [3]. In that driver, the trackingID stays the same and
+problem.  At each event synchronization, the set of actual contacts is
-unique until the contact vanishes (when the finger leaves the surface). The
+matched to the set of contacts from the previous synchronization. A full
-problem of assigning a set of anonymous fingers to a set of identified
+implementation can be found in [3].
-fingers is a euclidian bipartite matching problem at each event update, and
-relies on a sufficiently rapid update rate.
-There are a few devices that support trackingID in hardware. User space can
-make use of these native identifiers to reduce bandwidth and cpu usage.
 Gestures
diff --git a/Documentation/input/sentelic.txt b/Documentation/input/sentelic.txt
index b35affd5c649..b2ef125b71f8 100644
--- a/Documentation/input/sentelic.txt
+++ b/Documentation/input/sentelic.txt
@@ -341,7 +341,7 @@ Byte 5~8: Don't care (Absolute packet)
 FSP supports basic PS/2 commanding set and modes, refer to following URL for
 details about PS/2 commands:
-http://www.computer-engineering.org/index.php?title=PS/2_Mouse_Interface
+http://www.computer-engineering.org/ps2mouse/
 ==============================================================================
 * Programming Sequence for Determining Packet Parsing Flow
diff --git a/Documentation/input/xpad.txt b/Documentation/input/xpad.txt
index aae0d404c566..7cc9a436e6a1 100644
--- a/Documentation/input/xpad.txt
+++ b/Documentation/input/xpad.txt
@@ -150,7 +150,7 @@ the basic functionality.
 1. http://euc.jp/periphs/xbox-controller.ja.html (ITO Takayuki)
 2. http://xpad.xbox-scene.com/
-3. http://www.xboxhackz.com/Hackz-Reference.htm
+3. http://www.markosweb.com/www/xboxhackz.com/ 
 4. /proc/bus/usb/devices - dump from InterAct PowerPad Pro (Germany):
diff --git a/Documentation/intel_txt.txt b/Documentation/intel_txt.txt
index 5dc59b04a71f..849de1a78e77 100644
--- a/Documentation/intel_txt.txt
+++ b/Documentation/intel_txt.txt
@@ -25,20 +25,18 @@ which has been updated for the new released platforms.
 Intel TXT has been presented at various events over the past few
 years, some of which are:
      LinuxTAG 2008:
-          http://www.linuxtag.org/2008/en/conf/events/vp-donnerstag/
+          http://www.linuxtag.org/2008/en/conf/events/vp-donnerstag.html
-          details.html?talkid=110
      TRUST2008:
-          http://www.trust2008.eu/downloads/Keynote-Speakers/
+          http://www.trust-conference.eu/downloads/Keynote-Speakers/
          3_David-Grawrock_The-Front-Door-of-Trusted-Computing.pdf
-      IDF 2008, Shanghai:
+      IDF, Shanghai:
-          http://inteldeveloperforum.com.edgesuite.net/shanghai_2008/
+          http://www.prcidf.com.cn/index_en.html
-          aep/PROS003/index.html
      IDFs 2006, 2007 (I'm not sure if/where they are online)
 Trusted Boot Project Overview:
 =============================
-Trusted Boot (tboot) is an open source, pre- kernel/VMM module that
+Trusted Boot (tboot) is an open source, pre-kernel/VMM module that
 uses Intel TXT to perform a measured and verified launch of an OS
 kernel/VMM.
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index dd5806f4fcc4..33223ff121d8 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -74,11 +74,12 @@ Code  Seq#(hex)	Include File		Comments
 0x10    00-0F   drivers/char/s390/vmcp.h
 0x12    all     linux/fs.h
                linux/blkpg.h
-0x1b    all     InfiniBand Subsystem    <http://www.openib.org/>
+0x1b    all     InfiniBand Subsystem    <http://infiniband.sourceforge.net/>
 0x20    all     drivers/cdrom/cm206.h
 0x22    all     scsi/sg.h
 '#'     00-3F   IEEE 1394 Subsystem     Block for the entire subsystem
 '$'     00-0F   linux/perf_counter.h, linux/perf_event.h
+'&'     00-07   drivers/firewire/nosy-user.h
 '1'     00-1F   <linux/timepps.h>       PPS kit from Ulrich Windl
                                        <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
 '2'     01-04   linux/i2o.h
@@ -190,7 +191,7 @@ Code  Seq#(hex)	Include File		Comments
 '['     00-07   linux/usb/tmc.h         USB Test and Measurement Devices
                                        <mailto:gregkh@suse.de>
 'a'     all     linux/atm*.h, linux/sonet.h     ATM on linux
-                                        <http://lrcwww.epfl.ch/linux-atm/magic.html>
+                                        <http://lrcwww.epfl.ch/>
 'b'     00-FF                           conflict! bit3 vme host bridge
                                        <mailto:natalia@nikhefk.nikhef.nl>
 'b'     00-0F   media/bt819.h           conflict!
@@ -225,7 +226,7 @@ Code  Seq#(hex)	Include File		Comments
 'k'     00-0F   linux/spi/spidev.h      conflict!
 'k'     00-05   video/kyro.h            conflict!
 'l'     00-3F   linux/tcfs_fs.h         transparent cryptographic file system
-                                        <http://mikonos.dia.unisa.it/tcfs>
+                                        <http://web.archive.org/web/*/http://mikonos.dia.unisa.it/tcfs>
 'l'     40-7F   linux/udf_fs_i.h        in development:
                                        <http://sourceforge.net/projects/linux-udf/>
 'm'     00-09   linux/mmtimer.h         conflict!
@@ -252,7 +253,7 @@ Code  Seq#(hex)	Include File		Comments
                                        <mailto:giometti@linux.it>
 'q'     00-1F   linux/serio.h
 'q'     80-FF   linux/telephony.h       Internet PhoneJACK, Internet LineJACK
-                linux/ixjuser.h         <http://www.quicknet.net>
+                linux/ixjuser.h         <http://web.archive.org/web/*/http://www.quicknet.net>
 'r'     00-1F   linux/msdos_fs.h and fs/fat/dir.c
 's'     all     linux/cdk.h
 't'     00-7F   linux/if_ppp.h
@@ -286,7 +287,7 @@ Code  Seq#(hex)	Include File		Comments
 0x89    F0-FF   linux/sockios.h         SIOCDEVPRIVATE range
 0x8B    all     linux/wireless.h
 0x8C    00-3F                           WiNRADiO driver
-                                        <http://www.proximity.com.au/~brian/winradio/>
+                                        <http://www.winradio.com.au/>
 0x90    00      drivers/cdrom/sbpcd.h
 0x92    00-0F   drivers/usb/mon/mon_bin.c
 0x93    60-7F   linux/auto_fs.h
diff --git a/Documentation/isdn/INTERFACE.CAPI b/Documentation/isdn/INTERFACE.CAPI
index f172091fb7cd..309eb5ed942b 100644
--- a/Documentation/isdn/INTERFACE.CAPI
+++ b/Documentation/isdn/INTERFACE.CAPI
@@ -113,12 +113,16 @@ char *driver_name
 int (*load_firmware)(struct capi_ctr *ctrlr, capiloaddata *ldata)
        (optional) pointer to a callback function for sending firmware and
        configuration data to the device
+        The function may return before the operation has completed.
+        Completion must be signalled by a call to capi_ctr_ready().
        Return value: 0 on success, error code on error
        Called in process context.
 void (*reset_ctr)(struct capi_ctr *ctrlr)
-        (optional) pointer to a callback function for performing a reset on
+        (optional) pointer to a callback function for stopping the device,
-        the device, releasing all registered applications
+        releasing all registered applications
+        The function may return before the operation has completed.
+        Completion must be signalled by a call to capi_ctr_down().
        Called in process context.
 void (*register_appl)(struct capi_ctr *ctrlr, u16 applid,
diff --git a/Documentation/isdn/README b/Documentation/isdn/README
index 6783437f21c2..cfb1884342ee 100644
--- a/Documentation/isdn/README
+++ b/Documentation/isdn/README
@@ -36,7 +36,7 @@ README for the ISDN-subsystem
     http://www.mhessler.de/i4lfaq/
  It can be viewed online, or downloaded in sgml/text/html format.
  The FAQ can also be viewed online at
-     http://www.isdn4inux.de/faq/
+     http://www.isdn4linux.de/faq/
  or downloaded from
     ftp://ftp.isdn4linux.de/pub/isdn4linux/FAQ/
diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index 031c8d814337..99e87a61897d 100644
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -486,7 +486,7 @@ Appendix: Teles PCMCIA driver
 -----------------------------
 See
-   http://www.stud.uni-wuppertal.de/~ea0141/pcmcia.html
+   http://www.linux.no/teles_cs.txt 
 for instructions.
 Appendix: Linux and ISDN-leased lines
diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset
index e472df842323..ef3343eaa002 100644
--- a/Documentation/isdn/README.gigaset
+++ b/Documentation/isdn/README.gigaset
@@ -47,9 +47,9 @@ GigaSet 307x Device Driver
 1.2. Software
     --------
-     The driver works with ISDN4linux and so can be used with any software
+     The driver works with the Kernel CAPI subsystem as well as the old
-     which is able to use ISDN4linux for ISDN connections (voice or data).
+     ISDN4Linux subsystem, so it can be used with any software which is able
-     Experimental Kernel CAPI support is available as a compilation option.
+     to use CAPI 2.0 or ISDN4Linux for ISDN connections (voice or data).
     There are some user space tools available at
     http://sourceforge.net/projects/gigaset307x/
@@ -152,61 +152,42 @@ GigaSet 307x Device Driver
     - GIGVER_FWBASE: retrieve the firmware version of the base
     Upon return, version[] is filled with the requested version information.
-2.3. ISDN4linux
+2.3. CAPI
-     ----------
-     This is the "normal" mode of operation. After loading the module you can
-     set up the ISDN system just as you'd do with any ISDN card supported by
-     the ISDN4Linux subsystem. Most distributions provide some configuration
-     utility. If not, you can use some HOWTOs like
-         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html
-     If this doesn't work, because you have some device like SX100 where
-     debug output (see section 3.2.) shows something like this when dialing
-         CMD Received: ERROR
-         Available Params: 0
-         Connection State: 0, Response: -1
-         gigaset_process_response: resp_code -1 in ConState 0 !
-         Timeout occurred
-     you probably need to use unimodem mode. (see section 2.5.)
-2.4. CAPI
     ----
     If the driver is compiled with CAPI support (kernel configuration option
-     GIGASET_CAPI, experimental) it can also be used with CAPI 2.0 kernel and
+     GIGASET_CAPI) the devices will show up as CAPI controllers as soon as the
-     user space applications. For user space access, the module capi.ko must
+     corresponding driver module is loaded, and can then be used with CAPI 2.0
-     be loaded. The capiinit command (included in the capi4k-utils package)
+     kernel and user space applications. For user space access, the module
-     does this for you.
+     capi.ko must be loaded.
-     The CAPI variant of the driver supports legacy ISDN4Linux applications
+     Legacy ISDN4Linux applications are supported via the capidrv
-     via the capidrv compatibility driver. The kernel module capidrv.ko must
+     compatibility driver. The kernel module capidrv.ko must be loaded
-     be loaded explicitly with the command
+     explicitly with the command
        modprobe capidrv
     if needed, and cannot be unloaded again without unloading the driver
     first. (These are limitations of capidrv.)
-     The note about unimodem mode in the preceding section applies here, too.
+     Most distributions handle loading and unloading of the various CAPI
+     modules automatically via the command capiinit(1) from the capi4k-utils
-2.5. Unimodem mode
+     package or a similar mechanism. Note that capiinit(1) cannot unload the
-     -------------
+     Gigaset drivers because it doesn't support more than one module per
-     This is needed for some devices [e.g. SX100] as they have problems with
+     driver.
-     the "normal" commands.
-     If you have installed the command line tool gigacontr, you can enter
+2.4. ISDN4Linux
-     unimodem mode using
+     ----------
-         gigacontr --mode unimodem
+     If the driver is compiled without CAPI support (native ISDN4Linux
-     You can switch back using
+     variant), it registers the device with the legacy ISDN4Linux subsystem
-         gigacontr --mode isdn
+     after loading the module. It can then be used with ISDN4Linux
+     applications only. Most distributions provide some configuration utility
+     for setting up that subsystem. Otherwise you can use some HOWTOs like
+         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html
-     You can also put the driver directly into Unimodem mode when it's loaded,
-     by passing the module parameter startmode=0 to the hardware specific
-     module, e.g.
-        modprobe usb_gigaset startmode=0
-     or by adding a line like
-        options usb_gigaset startmode=0
-     to an appropriate module configuration file, like /etc/modprobe.d/gigaset
-     or /etc/modprobe.conf.local.
+2.5. Unimodem mode
+     -------------
     In this mode the device works like a modem connected to a serial port
     (the /dev/ttyGU0, ... mentioned above) which understands the commands
         ATZ                 init, reset
             => OK or ERROR
         ATD
@@ -234,6 +215,31 @@ GigaSet 307x Device Driver
     to an appropriate module configuration file, like /etc/modprobe.d/gigaset
     or /etc/modprobe.conf.local.
+     Unimodem mode is needed for making some devices [e.g. SX100] work which
+     do not support the regular Gigaset command set. If debug output (see
+     section 3.2.) shows something like this when dialing:
+         CMD Received: ERROR
+         Available Params: 0
+         Connection State: 0, Response: -1
+         gigaset_process_response: resp_code -1 in ConState 0 !
+         Timeout occurred
+     then switching to unimodem mode may help.
+     If you have installed the command line tool gigacontr, you can enter
+     unimodem mode using
+         gigacontr --mode unimodem
+     You can switch back using
+         gigacontr --mode isdn
+     You can also put the driver directly into Unimodem mode when it's loaded,
+     by passing the module parameter startmode=0 to the hardware specific
+     module, e.g.
+        modprobe usb_gigaset startmode=0
+     or by adding a line like
+        options usb_gigaset startmode=0
+     to an appropriate module configuration file, like /etc/modprobe.d/gigaset
+     or /etc/modprobe.conf.local.
 2.6. Call-ID (CID) mode
     ------------------
     Call-IDs are numbers used to tag commands to, and responses from, the
@@ -263,7 +269,22 @@ GigaSet 307x Device Driver
     change its CID mode while the driver is loaded, eg.
        echo 0 > /sys/class/tty/ttyGU0/cidmode
-2.7. Unregistered Wireless Devices (M101/M105)
+2.7. Dialing Numbers
+     ---------------
+     The called party number provided by an application for dialing out must
+     be a public network number according to the local dialing plan, without
+     any dial prefix for getting an outside line.
+     Internal calls can be made by providing an internal extension number
+     prefixed with "**" (two asterisks) as the called party number. So to dial
+     eg. the first registered DECT handset, give "**11" as the called party
+     number. Dialing "***" (three asterisks) calls all extensions
+     simultaneously (global call).
+     This holds for both CAPI 2.0 and ISDN4Linux applications. Unimodem mode
+     does not support internal calls.
+2.8. Unregistered Wireless Devices (M101/M105)
     -----------------------------------------
     The main purpose of the ser_gigaset and usb_gigaset drivers is to allow
     the M101 and M105 wireless devices to be used as ISDN devices for ISDN
diff --git a/Documentation/ja_JP/HOWTO b/Documentation/ja_JP/HOWTO
index 55476982b5ca..b63301a03811 100644
--- a/Documentation/ja_JP/HOWTO
+++ b/Documentation/ja_JP/HOWTO
@@ -223,7 +223,7 @@ web サイトには、コードの構成、サブシステム、現在存在す�
 あなたがどこからスタートして良いかわからないが、Linux カーネル開発コミュ
 ニティに参加して何かすることをさがしている場合には、Linux kernel
 Janitor's プロジェクトにいけば良いでしょう -
-        http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors
 ここはそのようなスタートをするのにうってつけの場所です。ここには、
 Linux カーネルソースツリーの中に含まれる、きれいにし、修正しなければな
 らない、単純な問題のリストが記述されています。このプロジェクトに関わる
diff --git a/Documentation/ja_JP/SubmittingPatches b/Documentation/ja_JP/SubmittingPatches
index a9dc1243e859..f107c834d242 100644
--- a/Documentation/ja_JP/SubmittingPatches
+++ b/Documentation/ja_JP/SubmittingPatches
@@ -97,7 +97,7 @@ Quilt:
 http://savannah.nongnu.org/projects/quilt
 Andrew Morton's patch scripts:
-http://www.zip.com.au/~akpm/linux/patches/
+http://userweb.kernel.org/~akpm/stuff/tpp.txt
 このリンクの先のスクリプトの代わりとして、quilt がパッチマネジメント
 ツールとして推奨されています(上のリンクを見てください)。
@@ -210,7 +210,7 @@ VGER.KERNEL.ORG でホスティングされているメーリングリストの�
 ・移植性のないコードから移植性のあるコードへの置き換え(小さい範囲で
   あればアーキテクチャ特有のことでも他の人がコピーできます)
 ・作者やメンテナによる修正(すなわち patch monkey の再転送モード)
-URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>
+EMAIL: <trivial@kernel.org>
 7) MIME やリンクや圧縮ファイルや添付ファイルではなくプレインテキストのみ
@@ -534,7 +534,7 @@ gcc においては、マクロと同じくらい軽いです。
 ----------------------
 Andrew Morton, "The perfect patch" (tpp).
-  <http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt>
+  <http://userweb.kernel.org/~akpm/stuff/tpp.txt>
 Jeff Garzik, "Linux kernel patch submission format".
  <http://linux.yyz.us/patch-format.html>
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index 634c625da8ce..1e5165aa9e4e 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -22,11 +22,33 @@ building C files and assembler files.
 KAFLAGS
 --------------------------------------------------
-Additional options to the assembler.
+Additional options to the assembler (for built-in and modules).
+AFLAGS_MODULE
+--------------------------------------------------
+Addtional module specific options to use for $(AS).
+AFLAGS_KERNEL
+--------------------------------------------------
+Addtional options for $(AS) when used for assembler
+code for code that is compiled as built-in.
 KCFLAGS
 --------------------------------------------------
-Additional options to the C compiler.
+Additional options to the C compiler (for built-in and modules).
+CFLAGS_KERNEL
+--------------------------------------------------
+Addtional options for $(CC) when used to compile
+code that is compiled as built-in.
+CFLAGS_MODULE
+--------------------------------------------------
+Addtional module specific options to use for $(CC).
+LDFLAGS_MODULE
+--------------------------------------------------
+Additional options used for $(LD) when linking modules.
 KBUILD_VERBOSE
 --------------------------------------------------
@@ -40,15 +62,15 @@ Set the directory to look for the kernel source when building external
 modules.
 The directory can be specified in several ways:
 1) Use "M=..." on the command line
-2) Environmnet variable KBUILD_EXTMOD
+2) Environment variable KBUILD_EXTMOD
-3) Environmnet variable SUBDIRS
+3) Environment variable SUBDIRS
 The possibilities are listed in the order they take precedence.
 Using "M=..." will always override the others.
 KBUILD_OUTPUT
 --------------------------------------------------
 Specify the output directory when building the kernel.
-The output directory can also be specificed using "O=...".
+The output directory can also be specified using "O=...".
 Setting "O=..." takes precedence over KBUILD_OUTPUT.
 ARCH
@@ -90,7 +112,7 @@ The script will be called with the following arguments:
    $3 - kernel map file
    $4 - default install path (use root directory if blank)
-The implmentation of "make install" is architecture specific
+The implementation of "make install" is architecture specific
 and it may differ from the above.
 INSTALLKERNEL is provided to enable the possibility to
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 71c602d61680..c787ae512120 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -45,7 +45,6 @@ This document describes the Linux kernel Makefiles.
                --- 7.1 header-y
                --- 7.2 objhdr-y
                --- 7.3 destination-y
-                --- 7.4 unifdef-y (deprecated)
        === 8 Kbuild Variables
        === 9 Makefile language
@@ -168,7 +167,7 @@ more details, with real examples.
                #drivers/isdn/i4l/Makefile
                # Makefile for the kernel ISDN subsystem and device drivers.
                # Each configuration option enables a list of files.
-                obj-$(CONFIG_ISDN)             += isdn.o
+                obj-$(CONFIG_ISDN_I4L)         += isdn.o
                obj-$(CONFIG_ISDN_PPP_BSDCOMP) += isdn_bsdcomp.o
 --- 3.3 Loadable module goals - obj-m
@@ -187,34 +186,35 @@ more details, with real examples.
        Note: In this example $(CONFIG_ISDN_PPP_BSDCOMP) evaluates to 'm'
        If a kernel module is built from several source files, you specify
-        that you want to build a module in the same way as above.
+        that you want to build a module in the same way as above; however,
+        kbuild needs to know which object files you want to build your
-        Kbuild needs to know which the parts that you want to build your
+        module from, so you have to tell it by setting a $(<module_name>-y)
-        module from, so you have to tell it by setting an
+        variable.
-        $(<module_name>-objs) variable.
        Example:
                #drivers/isdn/i4l/Makefile
-                obj-$(CONFIG_ISDN) += isdn.o
+                obj-$(CONFIG_ISDN_I4L) += isdn.o
-                isdn-objs := isdn_net_lib.o isdn_v110.o isdn_common.o
+                isdn-y := isdn_net_lib.o isdn_v110.o isdn_common.o
        In this example, the module name will be isdn.o. Kbuild will
-        compile the objects listed in $(isdn-objs) and then run
+        compile the objects listed in $(isdn-y) and then run
        "$(LD) -r" on the list of these files to generate isdn.o.
-        Kbuild recognises objects used for composite objects by the suffix
+        Due to kbuild recognizing $(<module_name>-y) for composite objects,
-        -objs, and the suffix -y. This allows the Makefiles to use
+        you can use the value of a CONFIG_ symbol to optionally include an
-        the value of a CONFIG_ symbol to determine if an object is part
+        object file as part of a composite object.
-        of a composite object.
        Example:
                #fs/ext2/Makefile
-                obj-$(CONFIG_EXT2_FS)        += ext2.o
+                obj-$(CONFIG_EXT2_FS) += ext2.o
-                ext2-y                       := balloc.o bitmap.o
+                ext2-y := balloc.o dir.o file.o ialloc.o inode.o ioctl.o \
-                ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o
+                          namei.o super.o symlink.o
+                ext2-$(CONFIG_EXT2_FS_XATTR) += xattr.o xattr_user.o \
+                                                xattr_trusted.o
-        In this example, xattr.o is only part of the composite object
+        In this example, xattr.o, xattr_user.o and xattr_trusted.o are only
-        ext2.o if $(CONFIG_EXT2_FS_XATTR) evaluates to 'y'.
+        part of the composite object ext2.o if $(CONFIG_EXT2_FS_XATTR)
+        evaluates to 'y'.
        Note: Of course, when you are building objects into the kernel,
        the syntax above will also work. So, if you have CONFIG_EXT2_FS=y,
@@ -244,12 +244,12 @@ more details, with real examples.
        may contain both a built-in.o and a lib.a file.
        Example:
-                #arch/i386/lib/Makefile
+                #arch/x86/lib/Makefile
-                lib-y    := checksum.o delay.o
+                lib-y    := delay.o
-        This will create a library lib.a based on checksum.o and delay.o.
+        This will create a library lib.a based on delay.o. For kbuild to
-        For kbuild to actually recognize that there is a lib.a being built,
+        actually recognize that there is a lib.a being built, the directory
-        the directory shall be listed in libs-y.
+        shall be listed in libs-y.
        See also "6.3 List directories to visit when descending".
        Use of lib-y is normally restricted to lib/ and arch/*/lib.
@@ -284,43 +284,40 @@ more details, with real examples.
 --- 3.7 Compilation flags
    ccflags-y, asflags-y and ldflags-y
-        The three flags listed above applies only to the kbuild makefile
+        These three flags apply only to the kbuild makefile in which they
-        where they are assigned. They are used for all the normal
+        are assigned. They are used for all the normal cc, as and ld
-        cc, as and ld invocation happenign during a recursive build.
+        invocations happening during a recursive build.
        Note: Flags with the same behaviour were previously named:
        EXTRA_CFLAGS, EXTRA_AFLAGS and EXTRA_LDFLAGS.
-        They are yet supported but their use are deprecated.
+        They are still supported but their usage is deprecated.
-        ccflags-y specifies options for compiling C files with $(CC).
+        ccflags-y specifies options for compiling with $(CC).
        Example:
-                # drivers/sound/emu10k1/Makefile
+                # drivers/acpi/Makefile
-                ccflags-y += -I$(obj)
+                ccflags-y := -Os
-                ccflags-$(DEBUG) += -DEMU10K1_DEBUG
+                ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT
        This variable is necessary because the top Makefile owns the
        variable $(KBUILD_CFLAGS) and uses it for compilation flags for the
        entire tree.
-        asflags-y is a similar string for per-directory options
+        asflags-y specifies options for assembling with $(AS).
-        when compiling assembly language source.
        Example:
-                #arch/x86_64/kernel/Makefile
+                #arch/sparc/kernel/Makefile
-                asflags-y := -traditional
+                asflags-y := -ansi
+        ldflags-y specifies options for linking with $(LD).
-        ldflags-y is a string for per-directory options to $(LD).
        Example:
-                #arch/m68k/fpsp040/Makefile
+                #arch/cris/boot/compressed/Makefile
-                ldflags-y := -x
+                ldflags-y += -T $(srctree)/$(src)/decompress_$(arch-y).lds
    subdir-ccflags-y, subdir-asflags-y
-        The two flags listed above are similar to ccflags-y and as-falgs-y.
+        The two flags listed above are similar to ccflags-y and asflags-y.
-        The difference is that the subdir- variants has effect for the kbuild
+        The difference is that the subdir- variants have effect for the kbuild
-        file where tey are present and all subdirectories.
+        file where they are present and all subdirectories.
        Options specified using subdir-* are added to the commandline before
        the options specified using the non-subdir variants.
@@ -340,18 +337,18 @@ more details, with real examples.
                CFLAGS_aha152x.o =   -DAHA152X_STAT -DAUTOCONF
                CFLAGS_gdth.o    = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ \
                                     -DGDTH_STATISTICS
-                CFLAGS_seagate.o =   -DARBITRATE -DPARITY -DSEAGATE_USE_ASM
-        These three lines specify compilation flags for aha152x.o,
+        These two lines specify compilation flags for aha152x.o and gdth.o.
-        gdth.o, and seagate.o
        $(AFLAGS_$@) is a similar feature for source files in assembly
        languages.
        Example:
                # arch/arm/kernel/Makefile
-                AFLAGS_head-armv.o := -DTEXTADDR=$(TEXTADDR) -traditional
+                AFLAGS_head.o        := -DTEXT_OFFSET=$(TEXT_OFFSET)
-                AFLAGS_head-armo.o := -DTEXTADDR=$(TEXTADDR) -traditional
+                AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312
+                AFLAGS_iwmmxt.o      := -Wa,-mcpu=iwmmxt
 --- 3.9 Dependency tracking
@@ -923,16 +920,33 @@ When kbuild executes, the following steps are followed (roughly):
        The first example utilises the trick that a config option expands
        to 'y' when selected.
-    CFLAGS_KERNEL       $(CC) options specific for built-in
+    KBUILD_AFLAGS_KERNEL        $(AS) options specific for built-in
-        $(CFLAGS_KERNEL) contains extra C compiler flags used to compile
+        $(KBUILD_AFLAGS_KERNEL) contains extra C compiler flags used to compile
        resident kernel code.
-    CFLAGS_MODULE       $(CC) options specific for modules
+    KBUILD_AFLAGS_MODULE   Options for $(AS) when building modules
-        $(CFLAGS_MODULE) contains extra C compiler flags used to compile code
+        $(KBUILD_AFLAGS_MODULE) is used to add arch specific options that
-        for loadable kernel modules.
+        are used for $(AS).
+        From commandline AFLAGS_MODULE shall be used (see kbuild.txt).
+    KBUILD_CFLAGS_KERNEL        $(CC) options specific for built-in
+        $(KBUILD_CFLAGS_KERNEL) contains extra C compiler flags used to compile
+        resident kernel code.
+    KBUILD_CFLAGS_MODULE   Options for $(CC) when building modules
+        $(KBUILD_CFLAGS_MODULE) is used to add arch specific options that
+        are used for $(CC).
+        From commandline CFLAGS_MODULE shall be used (see kbuild.txt).
+    KBUILD_LDFLAGS_MODULE   Options for $(LD) when linking modules
+        $(KBUILD_LDFLAGS_MODULE) is used to add arch specific options
+        used when linking modules. This is often a linker script.
+        From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
 --- 6.2 Add prerequisites to archprepare:
@@ -1176,14 +1190,14 @@ When kbuild executes, the following steps are followed (roughly):
 === 7 Kbuild syntax for exported headers
 The kernel include a set of headers that is exported to userspace.
-Many headers can be exported as-is but other headers requires  a
+Many headers can be exported as-is but other headers require a
 minimal pre-processing before they are ready for user-space.
 The pre-processing does:
 - drop kernel specific annotations
 - drop include of compiler.h
- drop all sections that is kernel internat (guarded by ifdef __KERNEL__)
+- drop all sections that are kernel internal (guarded by ifdef __KERNEL__)
-Each relevant directory contain a file name "Kbuild" which specify the
+Each relevant directory contains a file name "Kbuild" which specifies the
 headers to be exported.
 See subsequent chapter for the syntax of the Kbuild file.
@@ -1230,11 +1244,6 @@ See subsequent chapter for the syntax of the Kbuild file.
        will be located in the directory "include/linux" when exported.
-        --- 7.4 unifdef-y (deprecated)
-        unifdef-y is deprecated. A direct replacement is header-y.
 === 8 Kbuild Variables
 The top Makefile exports the following variables:
diff --git a/Documentation/kernel-docs.txt b/Documentation/kernel-docs.txt
index ec8d31ee12e0..715eaaf1519d 100644
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
@@ -75,7 +75,7 @@
     * Title: "Conceptual Architecture of the Linux Kernel"
       Author: Ivan T. Bowman.
-       URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a1.html
+       URL: http://plg.uwaterloo.ca/
       Keywords: conceptual software architecture, extracted design,
       reverse engineering, system structure.
       Description: Conceptual software architecture of the Linux kernel,
@@ -84,7 +84,7 @@
     * Title: "Concrete Architecture of the Linux Kernel"
       Author: Ivan T. Bowman, Saheem Siddiqi, and Meyer C. Tanuan.
-       URL: http://plg.uwaterloo.ca/~itbowman/papers/CS746G-a2.html
+       URL: http://plg.uwaterloo.ca/
       Keywords: concrete architecture, extracted design, reverse
       engineering, system structure, dependencies.
       Description: Concrete architecture of the Linux kernel,
@@ -95,7 +95,7 @@
     * Title: "Linux as a Case Study: Its Extracted Software
       Architecture"
       Author: Ivan T. Bowman, Richard C. Holt and Neil V. Brewster.
-       URL: http://plg.uwaterloo.ca/~itbowman/papers/linuxcase.html
+       URL: http://plg.uwaterloo.ca/
       Keywords: software architecture, architecture recovery,
       redocumentation.
       Description: Paper appeared at ICSE'99, Los Angeles, May 16-22,
@@ -104,7 +104,7 @@
     * Title: "Overview of the Virtual File System"
       Author: Richard Gooch.
-       URL: http://www.atnf.csiro.au/~rgooch/linux/vfs.txt
+       URL: http://www.mjmwired.net/kernel/Documentation/filesystems/vfs.txt
       Keywords: VFS, File System, mounting filesystems, opening files,
       dentries, dcache.
       Description: Brief introduction to the Linux Virtual File System.
@@ -267,15 +267,13 @@
     * Title: "Kernel API changes from 2.0 to 2.2"
       Author: Richard Gooch.
       URL:
-       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.2.html
+       http://www.linuxhq.com/guides/LKMPG/node28.html 
       Keywords: 2.2, changes.
       Description: Kernel functions/structures/variables which changed
       from 2.0.x to 2.2.x.
     * Title: "Kernel API changes from 2.2 to 2.4"
       Author: Richard Gooch.
-       URL:
-       http://www.atnf.csiro.au/~rgooch/linux/docs/porting-to-2.4.html
       Keywords: 2.4, changes.
       Description: Kernel functions/structures/variables which changed
       from 2.2.x to 2.4.x.
@@ -290,7 +288,6 @@
       
     * Title: "I/O Event Handling Under Linux"
       Author: Richard Gooch.
-       URL: http://www.atnf.csiro.au/~rgooch/linux/docs/io-events.html
       Keywords: IO, I/O, select(2), poll(2), FDs, aio_read(2), readiness
       event queues.
       Description: From the Introduction: "I/O Event handling is about
@@ -386,64 +383,64 @@
     * Title: "Porting Device Drivers To Linux 2.2: part II"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-06/gear_01.html
+       URL: http://www.linux-mag.com/id/238 
       Keywords: ports, porting.
       Description: Second part on porting from 2.0 to 2.2 kernels.
     * Title: "How To Make Sure Your Driver Will Work On The Power
       Macintosh"
       Author: Paul Mackerras.
-       URL: http://www.linux-mag.com/1999-07/gear_01.html
+       URL: http://www.linux-mag.com/id/261
       Keywords: Mac, Power Macintosh, porting, drivers, compatibility.
       Description: The title says it all.
     * Title: "An Introduction to SCSI Drivers"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-08/gear_01.html
+       URL: http://www.linux-mag.com/id/284
       Keywords: SCSI, device, driver.
       Description: The title says it all.
     * Title: "Advanced SCSI Drivers And Other Tales"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-09/gear_01.html
+       URL: http://www.linux-mag.com/id/307
       Keywords: SCSI, device, driver, advanced.
       Description: The title says it all.
     * Title: "Writing Linux Mouse Drivers"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-10/gear_01.html
+       URL: http://www.linux-mag.com/id/330
       Keywords: mouse, driver, gpm.
       Description: The title says it all.
     * Title: "More on Mouse Drivers"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-11/gear_01.html
+       URL: http://www.linux-mag.com/id/356
       Keywords: mouse, driver, gpm, races, asynchronous I/O.
       Description: The title still says it all.
     * Title: "Writing Video4linux Radio Driver"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/1999-12/gear_01.html
+       URL: http://www.linux-mag.com/id/381
       Keywords: video4linux, driver, radio, radio devices.
       Description: The title says it all.
     * Title: "Video4linux Drivers, Part 1: Video-Capture Device"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/2000-01/gear_01.html
+       URL: http://www.linux-mag.com/id/406
       Keywords: video4linux, driver, video capture, capture devices,
       camera driver.
       Description: The title says it all.
     * Title: "Video4linux Drivers, Part 2: Video-capture Devices"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/2000-02/gear_01.html
+       URL: http://www.linux-mag.com/id/429
       Keywords: video4linux, driver, video capture, capture devices,
       camera driver, control, query capabilities, capability, facility.
       Description: The title says it all.
     * Title: "PCI Management in Linux 2.2"
       Author: Alan Cox.
-       URL: http://www.linux-mag.com/2000-03/gear_01.html
+       URL: http://www.linux-mag.com/id/452
       Keywords: PCI, bus, bus-mastering.
       Description: The title says it all.
@@ -502,7 +499,7 @@
       
     * Title: "A Linux vm README"
       Author: Kanoj Sarcar.
-       URL: http://reality.sgi.com/kanoj_engr/vm229.html
+       URL: http://kos.enix.org/pub/linux-vmm.html
       Keywords: virtual memory, mm, pgd, vma, page, page flags, page
       cache, swap cache, kswapd.
       Description: Telegraphic, short descriptions and definitions
@@ -659,7 +656,7 @@
     * Name: "Linux Kernel Source Reference"
       Author: Thomas Graichen.
-       URL: http://innominate.org/~graichen/projects/lksr/
+       URL: http://marc.info/?l=linux-kernel&m=96446640102205&w=4
       Keywords: CVS, web, cvsweb, browsing source code.
       Description: Web interface to a CVS server with the kernel
       sources. "Here you can have a look at any file of the Linux kernel
@@ -682,7 +679,7 @@
       produced during the week. Published every Thursday.
     * Name: "Kernel Traffic"
-       URL: http://kt.zork.net/kernel-traffic/
+       URL: http://kt.earth.li/kernel-traffic/index.html
       Keywords: linux-kernel mailing list, weekly kernel news.
       Description: Weekly newsletter covering the most relevant
       discussions of the linux-kernel mailing list.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2b2407d9a6d0..2c85c0692b01 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -73,7 +73,6 @@ parameter is applicable:
        MTD     MTD (Memory Technology Device) support is enabled.
        NET     Appropriate network support is enabled.
        NUMA    NUMA support is enabled.
-        GENERIC_TIME The generic timeofday code is enabled.
        NFS     Appropriate NFS support is enabled.
        OSS     OSS sound support is enabled.
        PV_OPS  A paravirtualized kernel is enabled.
@@ -89,10 +88,11 @@ parameter is applicable:
        RAM     RAM disk support is enabled.
        S390    S390 architecture is enabled.
        SCSI    Appropriate SCSI support is enabled.
-                        A lot of drivers has their options described inside of
+                        A lot of drivers have their options described inside
-                        Documentation/scsi/.
+                        the Documentation/scsi/ sub-directory.
        SECURITY Different security models are enabled.
        SELINUX SELinux support is enabled.
+        APPARMOR AppArmor support is enabled.
        SERIAL  Serial support is enabled.
        SH      SuperH architecture is enabled.
        SMP     The kernel is an SMP kernel.
@@ -115,6 +115,7 @@ parameter is applicable:
                        More X86-64 boot options can be found in
                        Documentation/x86/x86_64/boot-options.txt .
        X86     Either 32bit or 64bit x86 (same as X86-32+X86-64)
+        XEN     Xen support is enabled
 In addition, the following text indicates that the option:
@@ -280,36 +281,17 @@ and is between 256 and 4096 characters. It is defined in the file
                        no: ACPI OperationRegions are not marked as reserved,
                        no further checks are performed.
-        ad1848=         [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>,<type>
        add_efi_memmap  [EFI; X86] Include EFI memory map in
                        kernel's map of available physical RAM.
-        advansys=       [HW,SCSI]
-                        See header of drivers/scsi/advansys.c.
-        aedsp16=        [HW,OSS] Audio Excel DSP 16
-                        Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
-                        See also header of sound/oss/aedsp16.c.
        agp=            [AGP]
                        { off | try_unsupported }
                        off: disable AGP support
                        try_unsupported: try to drive unsupported chipsets
                                (may crash computer or cause data corruption)
-        aha152x=        [HW,SCSI]
+        ALSA            [HW,ALSA]
-                        See Documentation/scsi/aha152x.txt.
+                        See Documentation/sound/alsa/alsa-parameters.txt
-        aha1542=        [HW,SCSI]
-                        Format: <portbase>[,<buson>,<busoff>[,<dmaspeed>]]
-        aic7xxx=        [HW,SCSI]
-                        See Documentation/scsi/aic7xxx.txt.
-        aic79xx=        [HW,SCSI]
-                        See Documentation/scsi/aic79xx.txt.
        alignment=      [KNL,ARM]
                        Allow the default userspace alignment fault handler
@@ -371,8 +353,6 @@ and is between 256 and 4096 characters. It is defined in the file
        atarimouse=     [HW,MOUSE] Atari Mouse
-        atascsi=        [HW,SCSI] Atari SCSI
        atkbd.extra=    [HW] Enable extra LEDs and keys on IBM RapidAccess,
                        EzKey and similar keyboards
@@ -422,10 +402,6 @@ and is between 256 and 4096 characters. It is defined in the file
        bttv.pll=       See Documentation/video4linux/bttv/Insmod-options
        bttv.tuner=     and Documentation/video4linux/bttv/CARDLIST
-        BusLogic=       [HW,SCSI]
-                        See drivers/scsi/BusLogic.c, comment before function
-                        BusLogic_ParseDriverOptions().
        c101=           [NET] Moxa C101 synchronous serial card
        cachesize=      [BUGS=X86-32] Override level 2 CPU cache size detection.
@@ -468,7 +444,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        clocksource is not available, it defaults to PIT.
                        Format: { pit | tsc | cyclone | pmtmr }
-        clocksource=    [GENERIC_TIME] Override the default clocksource
+        clocksource=    Override the default clocksource
                        Format: <string>
                        Override the default clocksource and use the clocksource
                        with the name specified.
@@ -655,8 +631,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Disable PIN 1 of APIC timer
                        Can be useful to work around chipset bugs.
-        dmasound=       [HW,OSS] Sound subsystem buffers
        dma_debug=off   If the kernel is compiled with DMA_API_DEBUG support,
                        this option disables the debugging code at boot.
@@ -676,8 +650,6 @@ and is between 256 and 4096 characters. It is defined in the file
        dscc4.setup=    [NET]
-        dtc3181e=       [HW,SCSI]
        dynamic_printk  Enables pr_debug()/dev_dbg() calls if
                        CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled.
                        These can also be switched on/off via
@@ -686,8 +658,11 @@ and is between 256 and 4096 characters. It is defined in the file
        earlycon=       [KNL] Output early console device and options.
                uart[8250],io,<addr>[,options]
                uart[8250],mmio,<addr>[,options]
+                uart[8250],mmio32,<addr>[,options]
                        Start an early, polled-mode console on the 8250/16550
                        UART at the specified I/O port or MMIO address.
+                        MMIO inter-register address stride is either 8bit (mmio)
+                        or 32bit (mmio32).
                        The options are the same as for ttyS, above.
        earlyprintk=    [X86,SH,BLACKFIN]
@@ -715,8 +690,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        This is desgined to be used in conjunction with
                        the boot argument: earlyprintk=vga
-        eata=           [HW,SCSI]
        edd=            [EDD]
                        Format: {"off" | "on" | "skip[mbr]"}
@@ -772,12 +745,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <interval>,<probability>,<space>,<times>
                        See also /Documentation/fault-injection/.
-        fd_mcs=         [HW,SCSI]
-                        See header of drivers/scsi/fd_mcs.c.
-        fdomain=        [HW,SCSI]
-                        See header of drivers/scsi/fdomain.c.
        floppy=         [HW]
                        See Documentation/blockdev/floppy.txt.
@@ -837,14 +804,9 @@ and is between 256 and 4096 characters. It is defined in the file
                        When zero, profiling data is discarded and associated
                        debugfs files are removed at module unload time.
-        gdth=           [HW,SCSI]
-                        See header of drivers/scsi/gdth.c.
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT.
-        gvp11=          [HW,SCSI]
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
                        are distributed across NUMA nodes.  Defaults on
                        for 64bit NUMA, off otherwise.
@@ -917,9 +879,6 @@ and is between 256 and 4096 characters. It is defined in the file
                             controller
        i8042.nopnp     [HW] Don't use ACPIPnP / PnPBIOS to discover KBD/AUX
                             controllers
-        i8042.panicblink=
-                        [HW] Frequency with which keyboard LEDs should blink
-                             when kernel panics (default is 0.5 sec)
        i8042.reset     [HW] Reset the controller during init and cleanup
        i8042.unlock    [HW] Unlock (ignore) the keylock
@@ -936,9 +895,6 @@ and is between 256 and 4096 characters. It is defined in the file
        i8k.restricted  [HW] Allow controlling fans only if SYS_ADMIN
                        capability is set.
-        ibmmcascsi=     [HW,MCA,SCSI] IBM MicroChannel SCSI adapter
-                        See Documentation/mca.txt.
        icn=            [HW,ISDN]
                        Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
@@ -988,9 +944,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        programs exec'd, files mmap'd for exec, and all files
                        opened for read by uid=0.
-        in2000=         [HW,SCSI]
-                        See header of drivers/scsi/in2000.c.
        init=           [KNL]
                        Format: <full_path>
                        Run specified binary instead of /sbin/init as init
@@ -1028,6 +981,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        result in a hardware IOTLB flush operation as opposed
                        to batching them for performance.
+        intremap=       [X86-64, Intel-IOMMU]
+                        Format: { on (default) | off | nosid }
+                        on      enable Interrupt Remapping (default)
+                        off     disable Interrupt Remapping
+                        nosid   disable Source ID checking
        inttest=        [IA64]
        iomem=          Disable strict checking of access to MMIO memory
@@ -1068,9 +1027,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        See comment before ip2_setup() in
                        drivers/char/ip2/ip2base.c.
-        ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
-                        See header of drivers/scsi/ips.c.
        irqfixup        [HW]
                        When an interrupt is not handled search all handlers
                        for it. Intended to get systems with badly broken
@@ -1143,9 +1099,12 @@ and is between 256 and 4096 characters. It is defined in the file
        kgdboc=         [KGDB,HW] kgdb over consoles.
                        Requires a tty driver that supports console polling,
                        or a supported polling keyboard driver (non-usb).
-                        Serial only format: <serial_device>[,baud]
+                         Serial only format: <serial_device>[,baud]
-                        keyboard only format: kbd
+                         keyboard only format: kbd
-                        keyboard and serial format: kbd,<serial_device>[,baud]
+                         keyboard and serial format: kbd,<serial_device>[,baud]
+                        Optional Kernel mode setting:
+                         kms, kbd format: kms,kbd
+                         kms, kbd and serial format: kms,kbd,<ser_dev>[,baud]
        kgdbwait        [KGDB] Stop kernel execution and enter the
                        kernel debugger at the earliest opportunity.
@@ -1343,9 +1302,6 @@ and is between 256 and 4096 characters. It is defined in the file
        ltpc=           [NET]
                        Format: <io>,<irq>,<dma>
-        mac5380=        [HW,SCSI] Format:
-                        <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
        machvec=        [IA64] Force the use of a particular machine-vector
                        (machvec) in a generic kernel.
                        Example: machvec=hpzx1_swiotlb
@@ -1367,13 +1323,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        be mounted
                        Format: <1-256>
-        max_luns=       [SCSI] Maximum number of LUNs to probe.
-                        Should be between 1 and 2^32-1.
-        max_report_luns=
-                        [SCSI] Maximum number of LUNs received.
-                        Should be between 1 and 16384.
        mcatest=        [IA-64]
        mce             [X86-32] Machine Check Exception
@@ -1523,9 +1472,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        that the amount of memory usable for all allocations
                        is not too small.
-        mpu401=         [HW,OSS]
-                        Format: <io>,<irq>
        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
@@ -1573,19 +1519,6 @@ and is between 256 and 4096 characters. It is defined in the file
        n2=             [NET] SDL Inc. RISCom/N2 synchronous serial card
-        NCR_D700=       [HW,SCSI]
-                        See header of drivers/scsi/NCR_D700.c.
-        ncr5380=        [HW,SCSI]
-        ncr53c400=      [HW,SCSI]
-        ncr53c400a=     [HW,SCSI]
-        ncr53c406a=     [HW,SCSI]
-        ncr53c8xx=      [HW,SCSI]
        netdev=         [NET] Network devices parameters
                        Format: <irq>,<io>,<mem_start>,<mem_end>,<name>
                        Note that mem_start is often overloaded to mean
@@ -1597,8 +1530,7 @@ and is between 256 and 4096 characters. It is defined in the file
                        [NETFILTER] Enable connection tracking flow accounting
                        0 to disable accounting
                        1 to enable accounting
-                        Default value depends on CONFIG_NF_CT_ACCT that is
+                        Default value is 0.
-                        going to be removed in 2.6.29.
        nfsaddrs=       [NFS]
                        See Documentation/filesystems/nfs/nfsroot.txt.
@@ -1755,6 +1687,7 @@ and is between 256 and 4096 characters. It is defined in the file
        nointremap      [X86-64, Intel-IOMMU] Do not enable interrupt
                        remapping.
+                        [Deprecated - use intremap=off]
        nointroute      [IA-64]
@@ -1812,6 +1745,8 @@ and is between 256 and 4096 characters. It is defined in the file
        nousb           [USB] Disable the USB subsystem
+        nowatchdog      [KNL] Disable the lockup detector.
        nowb            [ARM]
        nox2apic        [X86-64,APIC] Do not enable x2APIC mode.
@@ -1849,9 +1784,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        For example, to override I2C bus2:
                        omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
-        opl3=           [HW,OSS]
-                        Format: <io>
        oprofile.timer= [HW]
                        Use timer interrupt instead of performance counters
@@ -1863,9 +1795,8 @@ and is between 256 and 4096 characters. It is defined in the file
                                perfmon on Intel CPUs instead of the
                                CPU specific event set.
-        osst=           [HW,SCSI] SCSI Tape Driver
+        OSS             [HW,OSS]
-                        Format: <buffer_size>,<write_threshold>
+                        See Documentation/sound/oss/oss-parameters.txt
-                        See also Documentation/scsi/st.txt.
        panic=          [KNL] Kernel behaviour on panic
                        Format: <timeout>
@@ -1899,12 +1830,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        Currently this function knows 686a and 8231 chips.
                        Format: [spp|ps2|epp|ecp|ecpepp]
-        pas2=           [HW,OSS] Format:
-                        <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
-        pas16=          [HW,SCSI]
-                        See header of drivers/scsi/pas16.c.
        pause_on_oops=
                        Halt all CPUs after the first oops has been printed for
                        the specified number of seconds.  This is to be used if
@@ -1970,6 +1895,8 @@ and is between 256 and 4096 characters. It is defined in the file
                norom           [X86] Do not assign address space to
                                expansion ROMs that do not already have
                                BIOS assigned address ranges.
+                nobar           [X86] Do not assign address space to the
+                                BARs that weren't assigned by the BIOS.
                irqmask=0xMMMM  [X86] Set a bit mask of IRQs allowed to be
                                assigned automatically to PCI devices. You can
                                make the kernel exclude IRQs of your ISA cards
@@ -2171,10 +2098,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        [HW,MOUSE] Controls Logitech smartscroll autorepeat.
                        0 = disabled, 1 = enabled (default).
-        pss=            [HW,OSS] Personal Sound System (ECHO ESC614)
-                        Format:
-                        <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
        pt.             [PARIDE]
                        See Documentation/blockdev/paride.txt.
@@ -2273,30 +2196,6 @@ and is between 256 and 4096 characters. It is defined in the file
        sched_debug     [KNL] Enables verbose scheduler debug messages.
-        scsi_debug_*=   [SCSI]
-                        See drivers/scsi/scsi_debug.c.
-        scsi_default_dev_flags=
-                        [SCSI] SCSI default device flags
-                        Format: <integer>
-        scsi_dev_flags= [SCSI] Black/white list entry for vendor and model
-                        Format: <vendor>:<model>:<flags>
-                        (flags are integer value)
-        scsi_logging_level=     [SCSI] a bit mask of logging levels
-                        See drivers/scsi/scsi_logging.h for bits.  Also
-                        settable via sysctl at dev.scsi.logging_level
-                        (/proc/sys/dev/scsi/logging_level).
-                        There is also a nice 'scsi_logging_level' script in the
-                        S390-tools package, available for download at
-                        http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
-        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
-                        discovered.  async scans them in kernel threads,
-                        allowing boot to proceed.  none ignores them, expecting
-                        user space to do the scan.
        security=       [SECURITY] Choose a security module to enable at boot.
                        If this boot parameter is not specified, only the first
                        security module asking for security registration will be
@@ -2312,6 +2211,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        If enabled at boot time, /selinux/disable can be used
                        later to disable prior to initial policy load.
+        apparmor=       [APPARMOR] Disable or enable AppArmor at boot time
+                        Format: { "0" | "1" }
+                        See security/apparmor/Kconfig help text
+                        0 -- disable.
+                        1 -- enable.
+                        Default value is set via kernel config option.
        serialnumber    [BUGS=X86-32]
        shapers=        [NET]
@@ -2323,9 +2229,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        The parameter means the number of CPUs to show,
                        for example 1 means boot CPU only.
-        sim710=         [SCSI,HW]
-                        See header of drivers/scsi/sim710.c.
        simeth=         [IA-64]
        simscsi=
@@ -2383,128 +2286,6 @@ and is between 256 and 4096 characters. It is defined in the file
                                1: Fast pin select (default)
                                2: ATC IRMode
-        snd-ad1816a=    [HW,ALSA]
-        snd-ad1848=     [HW,ALSA]
-        snd-ali5451=    [HW,ALSA]
-        snd-als100=     [HW,ALSA]
-        snd-als4000=    [HW,ALSA]
-        snd-azt2320=    [HW,ALSA]
-        snd-cmi8330=    [HW,ALSA]
-        snd-cmipci=     [HW,ALSA]
-        snd-cs4231=     [HW,ALSA]
-        snd-cs4232=     [HW,ALSA]
-        snd-cs4236=     [HW,ALSA]
-        snd-cs4281=     [HW,ALSA]
-        snd-cs46xx=     [HW,ALSA]
-        snd-dt019x=     [HW,ALSA]
-        snd-dummy=      [HW,ALSA]
-        snd-emu10k1=    [HW,ALSA]
-        snd-ens1370=    [HW,ALSA]
-        snd-ens1371=    [HW,ALSA]
-        snd-es968=      [HW,ALSA]
-        snd-es1688=     [HW,ALSA]
-        snd-es18xx=     [HW,ALSA]
-        snd-es1938=     [HW,ALSA]
-        snd-es1968=     [HW,ALSA]
-        snd-fm801=      [HW,ALSA]
-        snd-gusclassic= [HW,ALSA]
-        snd-gusextreme= [HW,ALSA]
-        snd-gusmax=     [HW,ALSA]
-        snd-hdsp=       [HW,ALSA]
-        snd-ice1712=    [HW,ALSA]
-        snd-intel8x0=   [HW,ALSA]
-        snd-interwave=  [HW,ALSA]
-        snd-interwave-stb=
-                        [HW,ALSA]
-        snd-korg1212=   [HW,ALSA]
-        snd-maestro3=   [HW,ALSA]
-        snd-mpu401=     [HW,ALSA]
-        snd-mtpav=      [HW,ALSA]
-        snd-nm256=      [HW,ALSA]
-        snd-opl3sa2=    [HW,ALSA]
-        snd-opti92x-ad1848=
-                        [HW,ALSA]
-        snd-opti92x-cs4231=
-                        [HW,ALSA]
-        snd-opti93x=    [HW,ALSA]
-        snd-pmac=       [HW,ALSA]
-        snd-rme32=      [HW,ALSA]
-        snd-rme96=      [HW,ALSA]
-        snd-rme9652=    [HW,ALSA]
-        snd-sb8=        [HW,ALSA]
-        snd-sb16=       [HW,ALSA]
-        snd-sbawe=      [HW,ALSA]
-        snd-serial=     [HW,ALSA]
-        snd-sgalaxy=    [HW,ALSA]
-        snd-sonicvibes= [HW,ALSA]
-        snd-sun-amd7930=
-                        [HW,ALSA]
-        snd-sun-cs4231= [HW,ALSA]
-        snd-trident=    [HW,ALSA]
-        snd-usb-audio=  [HW,ALSA,USB]
-        snd-via82xx=    [HW,ALSA]
-        snd-virmidi=    [HW,ALSA]
-        snd-wavefront=  [HW,ALSA]
-        snd-ymfpci=     [HW,ALSA]
        softlockup_panic=
                        [KNL] Should the soft-lockup detector generate panics.
@@ -2519,12 +2300,6 @@ and is between 256 and 4096 characters. It is defined in the file
        spia_pedr=
        spia_peddr=
-        sscape=         [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>
-        st=             [HW,SCSI] SCSI tape parameters (buffers, etc.)
-                        See Documentation/scsi/st.txt.
        stacktrace      [FTRACE]
                        Enabled the stack tracer on boot up.
@@ -2582,18 +2357,12 @@ and is between 256 and 4096 characters. It is defined in the file
        switches=       [HW,M68k]
-        sym53c416=      [HW,SCSI]
-                        See header of drivers/scsi/sym53c416.c.
        sysrq_always_enabled
                        [KNL]
                        Ignore sysrq setting - this boot parameter will
                        neutralize any effect of /proc/sys/kernel/sysrq.
                        Useful for debugging.
-        t128=           [HW,SCSI]
-                        See header of drivers/scsi/t128.c.
        tdfx=           [HW,DRM]
        test_suspend=   [SUSPEND]
@@ -2630,10 +2399,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        <deci-seconds>: poll all this frequency
                        0: no polling (default)
-        tmscsim=        [HW,SCSI]
-                        See comment before function dc390_setup() in
-                        drivers/scsi/tmscsim.c.
        topology=       [S390]
                        Format: {off | on}
                        Specify if the kernel should make use of the cpu
@@ -2661,10 +2426,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
-        trix=           [HW,OSS] MediaTrix AudioTrix Pro
-                        Format:
-                        <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
        tsc=            Disable clocksource-must-verify flag for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this
@@ -2678,15 +2439,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        <port#>,<js1>,<js2>,<js3>,<js4>,<js5>,<js6>,<js7>
                        See also Documentation/input/joystick-parport.txt
-        u14-34f=        [HW,SCSI] UltraStor 14F/34F SCSI host adapter
-                        See header of drivers/scsi/u14-34f.c.
-        uart401=        [HW,OSS]
-                        Format: <io>,<irq>
-        uart6850=       [HW,OSS]
-                        Format: <io>,<irq>
        uhash_entries=  [KNL,NET]
                        Set number of hash buckets for UDP/UDP-Lite connections
@@ -2852,15 +2604,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        overridden by individual drivers. 0 will hide
                        cursors, 1 will display them.
-        waveartist=     [HW,OSS]
-                        Format: <io>,<irq>,<dma>,<dma2>
-        wd33c93=        [HW,SCSI]
-                        See header of drivers/scsi/wd33c93.c.
-        wd7000=         [HW,SCSI]
-                        See header of drivers/scsi/wd7000.c.
        watchdog timers [HW,WDT] For information on watchdog timers,
                        see Documentation/watchdog/watchdog-parameters.txt
                        or other driver-specific files in the
@@ -2879,6 +2622,16 @@ and is between 256 and 4096 characters. It is defined in the file
        xd=             [HW,XT] Original XT pre-IDE (RLL encoded) disks.
        xd_geo=         See header of drivers/block/xd.c.
+        xen_emul_unplug=                [HW,X86,XEN]
+                        Unplug Xen emulated devices
+                        Format: [unplug0,][unplug1]
+                        ide-disks -- unplug primary master IDE devices
+                        aux-ide-disks -- unplug non-primary-master IDE devices
+                        nics -- unplug network devices
+                        all -- unplug all emulated devices (NICs and IDE disks)
+                        ignore -- continue loading the Xen platform PCI driver even
+                                if the version check failed
        xirc2ps_cs=     [NET,PCMCIA]
                        Format:
                        <irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
@@ -2887,5 +2640,4 @@ ______________________________________________________________________
 TODO:
-        Add documentation for ALSA options.
        Add more DRM drivers.
diff --git a/Documentation/ko_KR/HOWTO b/Documentation/ko_KR/HOWTO
index 029fca914c05..e3a55b6091e9 100644
--- a/Documentation/ko_KR/HOWTO
+++ b/Documentation/ko_KR/HOWTO
@@ -122,7 +122,7 @@ mtk.manpages@gmail.com의 메인테이너에게 보낼 것을 권장한다.
    올바른 패치들을 만드는 법에 관한 훌륭한 다른 문서들이 있다.
    "The Perfect Patch"
-        http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+        http://userweb.kernel.org/~akpm/stuff/tpp.txt
    "Linux kernel patch submission format"
        http://linux.yyz.us/patch-format.html
@@ -192,7 +192,7 @@ Documentation/DocBook/ 디렉토리 내에서 만들어지며 PDF, Postscript, H
 여러분이 어디서 시작해야 할진 모르지만 커널 개발 커뮤니티에 참여할 수
 있는 일들을 찾길 원한다면 리눅스 커널 Janitor 프로젝트를 살펴봐라.
-         http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors
 그곳은 시작하기에 훌륭한 장소이다. 그곳은 리눅스 커널 소스 트리내에
 간단히 정리되고 수정될 수 있는 문제들에 관하여 설명한다. 여러분은 이
 프로젝트를 대표하는 개발자들과 일하면서 자신의 패치를 리눅스 커널 트리에
@@ -596,7 +596,7 @@ Pat이라는 이름을 가진 여자가 있을 수도 있는 것이다. 리눅�
 이것이 무엇인지 더 자세한 것을 알고 싶다면 다음 문서의 ChageLog 항을 봐라.
   "The Perfect Patch"
-    http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+    http://userweb.kernel.org/~akpm/stuff/tpp.txt
@@ -610,7 +610,7 @@ Pat이라는 이름을 가진 여자가 있을 수도 있는 것이다. 리눅�
 ----------
-"개발 프로세스"(http://linux.tar.gz/articles/2.6-development_process) 섹션을
+"개발 프로세스"(http://lwn.net/Articles/94386/) 섹션을
 작성하는데 있어 참고할 문서를 사용하도록 허락해준 Paolo Ciarrocchi에게
 감사한다. 여러분들이 말해야 할 것과 말해서는 안되는 것의 목록 중 일부를 제공해준
 Randy Dunlap과 Gerrit Huizenga에게 감사한다. 또한 검토와 의견 그리고
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 6653017680dd..1762b81fcdf2 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -285,6 +285,7 @@ architectures:
 - sparc64 (Return probes not yet implemented.)
 - arm
 - ppc
+- mips
 3. Configuring Kprobes
diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt
index a237518e51b9..5f5b64982b1a 100644
--- a/Documentation/kvm/api.txt
+++ b/Documentation/kvm/api.txt
@@ -126,6 +126,10 @@ user fills in the size of the indices array in nmsrs, and in return
 kvm adjusts nmsrs to reflect the actual number of msrs and fills in
 the indices array with their numbers.
+Note: if kvm indicates supports MCE (KVM_CAP_MCE), then the MCE bank MSRs are
+not returned in the MSR list, as different vcpus can have a different number
+of banks, as set via the KVM_X86_SETUP_MCE ioctl.
 4.4 KVM_CHECK_EXTENSION
 Capability: basic
@@ -160,29 +164,7 @@ Type: vm ioctl
 Parameters: struct kvm_memory_region (in)
 Returns: 0 on success, -1 on error
-struct kvm_memory_region {
+This ioctl is obsolete and has been removed.
-        __u32 slot;
-        __u32 flags;
-        __u64 guest_phys_addr;
-        __u64 memory_size; /* bytes */
-};
-/* for kvm_memory_region::flags */
-#define KVM_MEM_LOG_DIRTY_PAGES  1UL
-This ioctl allows the user to create or modify a guest physical memory
-slot.  When changing an existing slot, it may be moved in the guest
-physical memory space, or its flags may be modified.  It may not be
-resized.  Slots may not overlap.
-The flags field supports just one flag, KVM_MEM_LOG_DIRTY_PAGES, which
-instructs kvm to keep track of writes to memory within the slot.  See
-the KVM_GET_DIRTY_LOG ioctl.
-It is recommended to use the KVM_SET_USER_MEMORY_REGION ioctl instead
-of this API, if available.  This newer API allows placing guest memory
-at specified locations in the host address space, yielding better
-control and easy access.
 4.6 KVM_CREATE_VCPU
@@ -226,17 +208,7 @@ Type: vm ioctl
 Parameters: struct kvm_memory_alias (in)
 Returns: 0 (success), -1 (error)
-struct kvm_memory_alias {
+This ioctl is obsolete and has been removed.
-        __u32 slot;  /* this has a different namespace than memory slots */
-        __u32 flags;
-        __u64 guest_phys_addr;
-        __u64 memory_size;
-        __u64 target_phys_addr;
-};
-Defines a guest physical address space region as an alias to another
-region.  Useful for aliased address, for example the VGA low memory
-window. Should not be used with userspace memory.
 4.9 KVM_RUN
@@ -892,6 +864,174 @@ arguments.
 This ioctl is only useful after KVM_CREATE_IRQCHIP.  Without an in-kernel
 irqchip, the multiprocessing state must be maintained by userspace.
+4.39 KVM_SET_IDENTITY_MAP_ADDR
+Capability: KVM_CAP_SET_IDENTITY_MAP_ADDR
+Architectures: x86
+Type: vm ioctl
+Parameters: unsigned long identity (in)
+Returns: 0 on success, -1 on error
+This ioctl defines the physical address of a one-page region in the guest
+physical address space.  The region must be within the first 4GB of the
+guest physical address space and must not conflict with any memory slot
+or any mmio address.  The guest may malfunction if it accesses this memory
+region.
+This ioctl is required on Intel-based hosts.  This is needed on Intel hardware
+because of a quirk in the virtualization implementation (see the internals
+documentation when it pops into existence).
+4.40 KVM_SET_BOOT_CPU_ID
+Capability: KVM_CAP_SET_BOOT_CPU_ID
+Architectures: x86, ia64
+Type: vm ioctl
+Parameters: unsigned long vcpu_id
+Returns: 0 on success, -1 on error
+Define which vcpu is the Bootstrap Processor (BSP).  Values are the same
+as the vcpu id in KVM_CREATE_VCPU.  If this ioctl is not called, the default
+is vcpu 0.
+4.41 KVM_GET_XSAVE
+Capability: KVM_CAP_XSAVE
+Architectures: x86
+Type: vcpu ioctl
+Parameters: struct kvm_xsave (out)
+Returns: 0 on success, -1 on error
+struct kvm_xsave {
+        __u32 region[1024];
+};
+This ioctl would copy current vcpu's xsave struct to the userspace.
+4.42 KVM_SET_XSAVE
+Capability: KVM_CAP_XSAVE
+Architectures: x86
+Type: vcpu ioctl
+Parameters: struct kvm_xsave (in)
+Returns: 0 on success, -1 on error
+struct kvm_xsave {
+        __u32 region[1024];
+};
+This ioctl would copy userspace's xsave struct to the kernel.
+4.43 KVM_GET_XCRS
+Capability: KVM_CAP_XCRS
+Architectures: x86
+Type: vcpu ioctl
+Parameters: struct kvm_xcrs (out)
+Returns: 0 on success, -1 on error
+struct kvm_xcr {
+        __u32 xcr;
+        __u32 reserved;
+        __u64 value;
+};
+struct kvm_xcrs {
+        __u32 nr_xcrs;
+        __u32 flags;
+        struct kvm_xcr xcrs[KVM_MAX_XCRS];
+        __u64 padding[16];
+};
+This ioctl would copy current vcpu's xcrs to the userspace.
+4.44 KVM_SET_XCRS
+Capability: KVM_CAP_XCRS
+Architectures: x86
+Type: vcpu ioctl
+Parameters: struct kvm_xcrs (in)
+Returns: 0 on success, -1 on error
+struct kvm_xcr {
+        __u32 xcr;
+        __u32 reserved;
+        __u64 value;
+};
+struct kvm_xcrs {
+        __u32 nr_xcrs;
+        __u32 flags;
+        struct kvm_xcr xcrs[KVM_MAX_XCRS];
+        __u64 padding[16];
+};
+This ioctl would set vcpu's xcr to the value userspace specified.
+4.45 KVM_GET_SUPPORTED_CPUID
+Capability: KVM_CAP_EXT_CPUID
+Architectures: x86
+Type: system ioctl
+Parameters: struct kvm_cpuid2 (in/out)
+Returns: 0 on success, -1 on error
+struct kvm_cpuid2 {
+        __u32 nent;
+        __u32 padding;
+        struct kvm_cpuid_entry2 entries[0];
+};
+#define KVM_CPUID_FLAG_SIGNIFCANT_INDEX 1
+#define KVM_CPUID_FLAG_STATEFUL_FUNC    2
+#define KVM_CPUID_FLAG_STATE_READ_NEXT  4
+struct kvm_cpuid_entry2 {
+        __u32 function;
+        __u32 index;
+        __u32 flags;
+        __u32 eax;
+        __u32 ebx;
+        __u32 ecx;
+        __u32 edx;
+        __u32 padding[3];
+};
+This ioctl returns x86 cpuid features which are supported by both the hardware
+and kvm.  Userspace can use the information returned by this ioctl to
+construct cpuid information (for KVM_SET_CPUID2) that is consistent with
+hardware, kernel, and userspace capabilities, and with user requirements (for
+example, the user may wish to constrain cpuid to emulate older hardware,
+or for feature consistency across a cluster).
+Userspace invokes KVM_GET_SUPPORTED_CPUID by passing a kvm_cpuid2 structure
+with the 'nent' field indicating the number of entries in the variable-size
+array 'entries'.  If the number of entries is too low to describe the cpu
+capabilities, an error (E2BIG) is returned.  If the number is too high,
+the 'nent' field is adjusted and an error (ENOMEM) is returned.  If the
+number is just right, the 'nent' field is adjusted to the number of valid
+entries in the 'entries' array, which is then filled.
+The entries returned are the host cpuid as returned by the cpuid instruction,
+with unknown or unsupported features masked out.  The fields in each entry
+are defined as follows:
+  function: the eax value used to obtain the entry
+  index: the ecx value used to obtain the entry (for entries that are
+         affected by ecx)
+  flags: an OR of zero or more of the following:
+        KVM_CPUID_FLAG_SIGNIFCANT_INDEX:
+           if the index field is valid
+        KVM_CPUID_FLAG_STATEFUL_FUNC:
+           if cpuid for this function returns different values for successive
+           invocations; there will be several entries with the same function,
+           all with this flag set
+        KVM_CPUID_FLAG_STATE_READ_NEXT:
+           for KVM_CPUID_FLAG_STATEFUL_FUNC entries, set if this entry is
+           the first entry to be read by a cpu
+   eax, ebx, ecx, edx: the values returned by the cpuid instruction for
+         this function/index combination
 5. The kvm_run structure
 Application code obtains a pointer to the kvm_run structure by
diff --git a/Documentation/kvm/mmu.txt b/Documentation/kvm/mmu.txt
index aaed6ab9d7ab..142cc5136650 100644
--- a/Documentation/kvm/mmu.txt
+++ b/Documentation/kvm/mmu.txt
@@ -77,10 +77,10 @@ Memory
 Guest memory (gpa) is part of the user address space of the process that is
 using kvm.  Userspace defines the translation between guest addresses and user
-addresses (gpa->hva); note that two gpas may alias to the same gva, but not
+addresses (gpa->hva); note that two gpas may alias to the same hva, but not
 vice versa.
-These gvas may be backed using any method available to the host: anonymous
+These hvas may be backed using any method available to the host: anonymous
 memory, file backed memory, and device memory.  Memory might be paged by the
 host at any time.
@@ -161,7 +161,7 @@ Shadow pages contain the following information:
  role.cr4_pae:
    Contains the value of cr4.pae for which the page is valid (e.g. whether
    32-bit or 64-bit gptes are in use).
-  role.cr4_nxe:
+  role.nxe:
    Contains the value of efer.nxe for which the page is valid.
  role.cr0_wp:
    Contains the value of cr0.wp for which the page is valid.
@@ -180,7 +180,9 @@ Shadow pages contain the following information:
    guest pages as leaves.
  gfns:
    An array of 512 guest frame numbers, one for each present pte.  Used to
-    perform a reverse map from a pte to a gfn.
+    perform a reverse map from a pte to a gfn. When role.direct is set, any
+    element of this array can be calculated from the gfn field when used, in
+    this case, the array of gfns is not allocated. See role.direct and gfn.
  slot_bitmap:
    A bitmap containing one bit per memory slot.  If the page contains a pte
    mapping a page from memory slot n, then bit n of slot_bitmap will be set
@@ -296,6 +298,48 @@ Host translation updates:
  - look up affected sptes through reverse map
  - drop (or update) translations
+Emulating cr0.wp
+================
+If tdp is not enabled, the host must keep cr0.wp=1 so page write protection
+works for the guest kernel, not guest guest userspace.  When the guest
+cr0.wp=1, this does not present a problem.  However when the guest cr0.wp=0,
+we cannot map the permissions for gpte.u=1, gpte.w=0 to any spte (the
+semantics require allowing any guest kernel access plus user read access).
+We handle this by mapping the permissions to two possible sptes, depending
+on fault type:
+- kernel write fault: spte.u=0, spte.w=1 (allows full kernel access,
+  disallows user access)
+- read fault: spte.u=1, spte.w=0 (allows full read access, disallows kernel
+  write access)
+(user write faults generate a #PF)
+Large pages
+===========
+The mmu supports all combinations of large and small guest and host pages.
+Supported page sizes include 4k, 2M, 4M, and 1G.  4M pages are treated as
+two separate 2M pages, on both guest and host, since the mmu always uses PAE
+paging.
+To instantiate a large spte, four constraints must be satisfied:
+- the spte must point to a large host page
+- the guest pte must be a large pte of at least equivalent size (if tdp is
+  enabled, there is no guest pte and this condition is satisified)
+- if the spte will be writeable, the large page frame may not overlap any
+  write-protected pages
+- the guest page must be wholly contained by a single memory slot
+To check the last two conditions, the mmu maintains a ->write_count set of
+arrays for each memory slot and large page size.  Every write protected page
+causes its write_count to be incremented, thus preventing instantiation of
+a large spte.  The frames at the end of an unaligned memory slot have
+artificically inflated ->write_counts so they can never be instantiated.
 Further reading
 ===============
diff --git a/Documentation/kvm/msr.txt b/Documentation/kvm/msr.txt
new file mode 100644
index 000000000000..8ddcfe84c09a
--- /dev/null
+++ b/Documentation/kvm/msr.txt
@@ -0,0 +1,153 @@
+KVM-specific MSRs.
+Glauber Costa <glommer@redhat.com>, Red Hat Inc, 2010
+=====================================================
+KVM makes use of some custom MSRs to service some requests.
+At present, this facility is only used by kvmclock.
+Custom MSRs have a range reserved for them, that goes from
+0x4b564d00 to 0x4b564dff. There are MSRs outside this area,
+but they are deprecated and their use is discouraged.
+Custom MSR list
+--------
+The current supported Custom MSR list is:
+MSR_KVM_WALL_CLOCK_NEW:   0x4b564d00
+        data: 4-byte alignment physical address of a memory area which must be
+        in guest RAM. This memory is expected to hold a copy of the following
+        structure:
+        struct pvclock_wall_clock {
+                u32   version;
+                u32   sec;
+                u32   nsec;
+        } __attribute__((__packed__));
+        whose data will be filled in by the hypervisor. The hypervisor is only
+        guaranteed to update this data at the moment of MSR write.
+        Users that want to reliably query this information more than once have
+        to write more than once to this MSR. Fields have the following meanings:
+                version: guest has to check version before and after grabbing
+                time information and check that they are both equal and even.
+                An odd version indicates an in-progress update.
+                sec: number of seconds for wallclock.
+                nsec: number of nanoseconds for wallclock.
+        Note that although MSRs are per-CPU entities, the effect of this
+        particular MSR is global.
+        Availability of this MSR must be checked via bit 3 in 0x4000001 cpuid
+        leaf prior to usage.
+MSR_KVM_SYSTEM_TIME_NEW:  0x4b564d01
+        data: 4-byte aligned physical address of a memory area which must be in
+        guest RAM, plus an enable bit in bit 0. This memory is expected to hold
+        a copy of the following structure:
+        struct pvclock_vcpu_time_info {
+                u32   version;
+                u32   pad0;
+                u64   tsc_timestamp;
+                u64   system_time;
+                u32   tsc_to_system_mul;
+                s8    tsc_shift;
+                u8    flags;
+                u8    pad[2];
+        } __attribute__((__packed__)); /* 32 bytes */
+        whose data will be filled in by the hypervisor periodically. Only one
+        write, or registration, is needed for each VCPU. The interval between
+        updates of this structure is arbitrary and implementation-dependent.
+        The hypervisor may update this structure at any time it sees fit until
+        anything with bit0 == 0 is written to it.
+        Fields have the following meanings:
+                version: guest has to check version before and after grabbing
+                time information and check that they are both equal and even.
+                An odd version indicates an in-progress update.
+                tsc_timestamp: the tsc value at the current VCPU at the time
+                of the update of this structure. Guests can subtract this value
+                from current tsc to derive a notion of elapsed time since the
+                structure update.
+                system_time: a host notion of monotonic time, including sleep
+                time at the time this structure was last updated. Unit is
+                nanoseconds.
+                tsc_to_system_mul: a function of the tsc frequency. One has
+                to multiply any tsc-related quantity by this value to get
+                a value in nanoseconds, besides dividing by 2^tsc_shift
+                tsc_shift: cycle to nanosecond divider, as a power of two, to
+                allow for shift rights. One has to shift right any tsc-related
+                quantity by this value to get a value in nanoseconds, besides
+                multiplying by tsc_to_system_mul.
+                With this information, guests can derive per-CPU time by
+                doing:
+                        time = (current_tsc - tsc_timestamp)
+                        time = (time * tsc_to_system_mul) >> tsc_shift
+                        time = time + system_time
+                flags: bits in this field indicate extended capabilities
+                coordinated between the guest and the hypervisor. Availability
+                of specific flags has to be checked in 0x40000001 cpuid leaf.
+                Current flags are:
+                 flag bit   | cpuid bit    | meaning
+                -------------------------------------------------------------
+                            |              | time measures taken across
+                     0      |      24      | multiple cpus are guaranteed to
+                            |              | be monotonic
+                -------------------------------------------------------------
+        Availability of this MSR must be checked via bit 3 in 0x4000001 cpuid
+        leaf prior to usage.
+MSR_KVM_WALL_CLOCK:  0x11
+        data and functioning: same as MSR_KVM_WALL_CLOCK_NEW. Use that instead.
+        This MSR falls outside the reserved KVM range and may be removed in the
+        future. Its usage is deprecated.
+        Availability of this MSR must be checked via bit 0 in 0x4000001 cpuid
+        leaf prior to usage.
+MSR_KVM_SYSTEM_TIME: 0x12
+        data and functioning: same as MSR_KVM_SYSTEM_TIME_NEW. Use that instead.
+        This MSR falls outside the reserved KVM range and may be removed in the
+        future. Its usage is deprecated.
+        Availability of this MSR must be checked via bit 0 in 0x4000001 cpuid
+        leaf prior to usage.
+        The suggested algorithm for detecting kvmclock presence is then:
+                if (!kvm_para_available())    /* refer to cpuid.txt */
+                        return NON_PRESENT;
+                flags = cpuid_eax(0x40000001);
+                if (flags & 3) {
+                        msr_kvm_system_time = MSR_KVM_SYSTEM_TIME_NEW;
+                        msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK_NEW;
+                        return PRESENT;
+                } else if (flags & 0) {
+                        msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
+                        msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
+                        return PRESENT;
+                } else
+                        return NON_PRESENT;
diff --git a/Documentation/kvm/review-checklist.txt b/Documentation/kvm/review-checklist.txt
new file mode 100644
index 000000000000..730475ae1b8d
--- /dev/null
+++ b/Documentation/kvm/review-checklist.txt
@@ -0,0 +1,38 @@
+Review checklist for kvm patches
+================================
+1.  The patch must follow Documentation/CodingStyle and
+    Documentation/SubmittingPatches.
+2.  Patches should be against kvm.git master branch.
+3.  If the patch introduces or modifies a new userspace API:
+    - the API must be documented in Documentation/kvm/api.txt
+    - the API must be discoverable using KVM_CHECK_EXTENSION
+4.  New state must include support for save/restore.
+5.  New features must default to off (userspace should explicitly request them).
+    Performance improvements can and should default to on.
+6.  New cpu features should be exposed via KVM_GET_SUPPORTED_CPUID2
+7.  Emulator changes should be accompanied by unit tests for qemu-kvm.git
+    kvm/test directory.
+8.  Changes should be vendor neutral when possible.  Changes to common code
+    are better than duplicating changes to vendor code.
+9.  Similarly, prefer changes to arch independent code than to arch dependent
+    code.
+10. User/kernel interfaces and guest/host interfaces must be 64-bit clean
+    (all variables and sizes naturally aligned on 64-bit; use specific types
+    only - u64 rather than ulong).
+11. New guest visible features must either be documented in a hardware manual
+    or be accompanied by documentation.
+12. Features must be robust against reset and kexec - for example, shared
+    host/guest memory must be unshared to prevent the host from writing to
+    guest memory that the guest has not reserved for this purpose.
diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index 0768fcc3ba3e..4beafa663dd6 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -173,7 +173,7 @@ Credits
 *******
 Olaf Tauber, who did the real hard work when he developed acerhk
-http://www.informatik.hu-berlin.de/~tauber/acerhk
+http://www.cakey.de/acerhk/
 All the authors of laptop ACPI modules in the kernel, whose work
 was an inspiration in the early days of acer_acpi
 Mathieu Segaud, who solved the problem with having to modprobe the driver
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index fc15538d8b46..f6f80257addb 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -960,70 +960,21 @@ Sysfs notes:
        subsystem, and follow all of the hwmon guidelines at
        Documentation/hwmon.
+EXPERIMENTAL: Embedded controller register dump
+-----------------------------------------------
-EXPERIMENTAL: Embedded controller register dump -- /proc/acpi/ibm/ecdump
+This feature is not included in the thinkpad driver anymore.
------------------------------------------------------------------------
+Instead the EC can be accessed through /sys/kernel/debug/ec with
+a userspace tool which can be found here:
-This feature is marked EXPERIMENTAL because the implementation
+ftp://ftp.suse.com/pub/people/trenn/sources/ec
-directly accesses hardware registers and may not work as expected. USE
-WITH CAUTION! To use this feature, you need to supply the
-experimental=1 parameter when loading the module.
-This feature dumps the values of 256 embedded controller
-registers. Values which have changed since the last time the registers
-were dumped are marked with a star:
-[root@x40 ibm-acpi]# cat /proc/acpi/ibm/ecdump
-EC       +00 +01 +02 +03 +04 +05 +06 +07 +08 +09 +0a +0b +0c +0d +0e +0f
-EC 0x00:  a7  47  87  01  fe  96  00  08  01  00  cb  00  00  00  40  00
-EC 0x10:  00  00  ff  ff  f4  3c  87  09  01  ff  42  01  ff  ff  0d  00
-EC 0x20:  00  00  00  00  00  00  00  00  00  00  00  03  43  00  00  80
-EC 0x30:  01  07  1a  00  30  04  00  00 *85  00  00  10  00  50  00  00
-EC 0x40:  00  00  00  00  00  00  14  01  00  04  00  00  00  00  00  00
-EC 0x50:  00  c0  02  0d  00  01  01  02  02  03  03  03  03 *bc *02 *bc
-EC 0x60: *02 *bc *02  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0x70:  00  00  00  00  00  12  30  40 *24 *26 *2c *27 *20  80 *1f  80
-EC 0x80:  00  00  00  06 *37 *0e  03  00  00  00  0e  07  00  00  00  00
-EC 0x90:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xa0: *ff  09  ff  09  ff  ff *64  00 *00 *00 *a2  41 *ff *ff *e0  00
-EC 0xb0:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xc0:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xd0:  03  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xe0:  00  00  00  00  00  00  00  00  11  20  49  04  24  06  55  03
-EC 0xf0:  31  55  48  54  35  38  57  57  08  2f  45  73  07  65  6c  1a
-This feature can be used to determine the register holding the fan
-speed on some models. To do that, do the following:
+Use it to determine the register holding the fan
+speed on some models. To do that, do the following:
        - make sure the battery is fully charged
        - make sure the fan is running
-        - run 'cat /proc/acpi/ibm/ecdump' several times, once per second or so
+        - use above mentioned tool to read out the EC
-The first step makes sure various charging-related values don't
+Often fan and temperature values vary between
-vary. The second ensures that the fan-related values do vary, since
-the fan speed fluctuates a bit. The third will (hopefully) mark the
-fan register with a star:
-[root@x40 ibm-acpi]# cat /proc/acpi/ibm/ecdump
-EC       +00 +01 +02 +03 +04 +05 +06 +07 +08 +09 +0a +0b +0c +0d +0e +0f
-EC 0x00:  a7  47  87  01  fe  96  00  08  01  00  cb  00  00  00  40  00
-EC 0x10:  00  00  ff  ff  f4  3c  87  09  01  ff  42  01  ff  ff  0d  00
-EC 0x20:  00  00  00  00  00  00  00  00  00  00  00  03  43  00  00  80
-EC 0x30:  01  07  1a  00  30  04  00  00  85  00  00  10  00  50  00  00
-EC 0x40:  00  00  00  00  00  00  14  01  00  04  00  00  00  00  00  00
-EC 0x50:  00  c0  02  0d  00  01  01  02  02  03  03  03  03  bc  02  bc
-EC 0x60:  02  bc  02  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0x70:  00  00  00  00  00  12  30  40  24  27  2c  27  21  80  1f  80
-EC 0x80:  00  00  00  06 *be  0d  03  00  00  00  0e  07  00  00  00  00
-EC 0x90:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xa0:  ff  09  ff  09  ff  ff  64  00  00  00  a2  41  ff  ff  e0  00
-EC 0xb0:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xc0:  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xd0:  03  00  00  00  00  00  00  00  00  00  00  00  00  00  00  00
-EC 0xe0:  00  00  00  00  00  00  00  00  11  20  49  04  24  06  55  03
-EC 0xf0:  31  55  48  54  35  38  57  57  08  2f  45  73  07  65  6c  1a
-Another set of values that varies often is the temperature
 readings. Since temperatures don't change vary fast, you can take
 several quick dumps to eliminate them.
diff --git a/Documentation/ldm.txt b/Documentation/ldm.txt
index 718085bc9f1a..4f80edd14d0a 100644
--- a/Documentation/ldm.txt
+++ b/Documentation/ldm.txt
@@ -98,7 +98,7 @@ More Documentation
 There is an Overview of the LDM together with complete Technical Documentation.
 It is available for download.
-  http://www.linux-ntfs.org/content/view/19/37/
+  http://www.linux-ntfs.org/
 If you have any LDM questions that aren't answered in the documentation, email
 me.
diff --git a/Documentation/md.txt b/Documentation/md.txt
index e4e893ef3e01..a81c7b4790f2 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -1,5 +1,5 @@
 Tools that manage md devices can be found at
-   http://www.<country>.kernel.org/pub/linux/utils/raid/....
+   http://www.kernel.org/pub/linux/utils/raid/ 
 Boot time assembly of RAID arrays
diff --git a/Documentation/misc-devices/c2port.txt b/Documentation/misc-devices/c2port.txt
index d9bf93ea4398..ea7344465610 100644
--- a/Documentation/misc-devices/c2port.txt
+++ b/Documentation/misc-devices/c2port.txt
@@ -32,10 +32,10 @@ The C2 Interface main references are at (http://www.silabs.com)
 Silicon Laboratories site], see:
 - AN127: FLASH Programming via the C2 Interface at
-http://www.silabs.com/public/documents/tpub_doc/anote/Microcontrollers/Small_Form_Factor/en/an127.pdf, and
+http://www.silabs.com/Support Documents/TechnicalDocs/an127.pdf 
 - C2 Specification at
-http://www.silabs.com/public/documents/tpub_doc/spec/Microcontrollers/en/C2spec.pdf,
+http://www.silabs.com/pages/DownloadDoc.aspx?FILEURL=Support%20Documents/TechnicalDocs/an127.pdf&src=SearchResults
 however it implements a two wire serial communication protocol (bit
 banging) designed to enable in-system programming, debugging, and
diff --git a/Documentation/mmc/00-INDEX b/Documentation/mmc/00-INDEX
new file mode 100644
index 000000000000..fca586f5b853
--- /dev/null
+++ b/Documentation/mmc/00-INDEX
@@ -0,0 +1,4 @@
+00-INDEX
+        - this file
+mmc-dev-attrs.txt
+        - info on SD and MMC device attributes
diff --git a/Documentation/mmc/mmc-dev-attrs.txt b/Documentation/mmc/mmc-dev-attrs.txt
new file mode 100644
index 000000000000..ff2bd685bced
--- /dev/null
+++ b/Documentation/mmc/mmc-dev-attrs.txt
@@ -0,0 +1,56 @@
+SD and MMC Device Attributes
+============================
+All attributes are read-only.
+        cid                     Card Identifaction Register
+        csd                     Card Specific Data Register
+        scr                     SD Card Configuration Register (SD only)
+        date                    Manufacturing Date (from CID Register)
+        fwrev                   Firmware/Product Revision (from CID Register) (SD and MMCv1 only)
+        hwrev                   Hardware/Product Revision (from CID Register) (SD and MMCv1 only)
+        manfid                  Manufacturer ID (from CID Register)
+        name                    Product Name (from CID Register)
+        oemid                   OEM/Application ID (from CID Register)
+        serial                  Product Serial Number (from CID Register)
+        erase_size              Erase group size
+        preferred_erase_size    Preferred erase size
+Note on Erase Size and Preferred Erase Size:
+        "erase_size" is the  minimum size, in bytes, of an erase
+        operation.  For MMC, "erase_size" is the erase group size
+        reported by the card.  Note that "erase_size" does not apply
+        to trim or secure trim operations where the minimum size is
+        always one 512 byte sector.  For SD, "erase_size" is 512
+        if the card is block-addressed, 0 otherwise.
+        SD/MMC cards can erase an arbitrarily large area up to and
+        including the whole card.  When erasing a large area it may
+        be desirable to do it in smaller chunks for three reasons:
+                1. A single erase command will make all other I/O on
+                the card wait.  This is not a problem if the whole card
+                is being erased, but erasing one partition will make
+                I/O for another partition on the same card wait for the
+                duration of the erase - which could be a several
+                minutes.
+                2. To be able to inform the user of erase progress.
+                3. The erase timeout becomes too large to be very
+                useful.  Because the erase timeout contains a margin
+                which is multiplied by the size of the erase area,
+                the value can end up being several minutes for large
+                areas.
+        "erase_size" is not the most efficient unit to erase
+        (especially for SD where it is just one sector),
+        hence "preferred_erase_size" provides a good chunk
+        size for erasing large areas.
+        For MMC, "preferred_erase_size" is the high-capacity
+        erase size if a card specifies one, otherwise it is
+        based on the capacity of the card.
+        For SD, "preferred_erase_size" is the allocation unit
+        size specified by the card.
+        "preferred_erase_size" is in bytes.
diff --git a/Documentation/mtd/nand_ecc.txt b/Documentation/mtd/nand_ecc.txt
index 274821b35a7f..990efd7a9818 100644
--- a/Documentation/mtd/nand_ecc.txt
+++ b/Documentation/mtd/nand_ecc.txt
@@ -91,7 +91,7 @@ ECC 1   rp15  rp14  rp13  rp12  rp11  rp10  rp09  rp08
 ECC 2   cp5   cp4   cp3   cp2   cp1   cp0      1     1
 I detected after writing this that ST application note AN1823
-(http://www.st.com/stonline/books/pdf/docs/10123.pdf) gives a much
+(http://www.st.com/stonline/) gives a much
 nicer picture.(but they use line parity as term where I use row parity)
 Oh well, I'm graphically challenged, so suffer with me for a moment :-)
 And I could not reuse the ST picture anyway for copyright reasons.
diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt
index 3c45d5dcd63b..dcc9eaf59395 100644
--- a/Documentation/networking/3c509.txt
+++ b/Documentation/networking/3c509.txt
@@ -31,7 +31,7 @@ models:
 Large portions of this documentation were heavily borrowed from the guide
 written the original author of the 3c509 driver, Donald Becker. The master
 copy of that document, which contains notes on older versions of the driver,
-currently resides on Scyld web server: http://www.scyld.com/network/3c509.html.
+currently resides on Scyld web server: http://www.scyld.com/.
 (1) Special Driver Features
diff --git a/Documentation/networking/README.ipw2100 b/Documentation/networking/README.ipw2100
index f3fcaa41f774..6f85e1d06031 100644
--- a/Documentation/networking/README.ipw2100
+++ b/Documentation/networking/README.ipw2100
@@ -72,8 +72,7 @@ such, if you are interested in deploying or shipping a driver as part of
 solution intended to be used for purposes other than development, please
 obtain a tested driver from Intel Customer Support at:
-http://support.intel.com/support/notebook/sb/CS-006408.htm
+http://www.intel.com/support/wireless/sb/CS-006408.htm
 1. Introduction
 -----------------------------------------------
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 80c728522c4c..616a8e540b0b 100644
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -85,7 +85,7 @@ such, if you are interested in deploying or shipping a driver as part of
 solution intended to be used for purposes other than development, please 
 obtain a tested driver from Intel Customer Support at:
-http://support.intel.com/support/notebook/sb/CS-006408.htm
+http://support.intel.com
 1.   Introduction
@@ -171,7 +171,7 @@ Where the supported parameter are:
  
  led
        Can be used to turn on experimental LED code.
-        0 = Off, 1 = On.  Default is 0.
+        0 = Off, 1 = On.  Default is 1.
  mode
        Can be used to set the default mode of the adapter.  
diff --git a/Documentation/networking/README.sb1000 b/Documentation/networking/README.sb1000
index f82d42584e98..f92c2aac56a9 100644
--- a/Documentation/networking/README.sb1000
+++ b/Documentation/networking/README.sb1000
@@ -27,8 +27,8 @@ cable modem easy.
   in Franco's original source code distribution .tar.gz file.  Support for
   the sb1000 driver can be found at:
-      http://home.adelphia.net/~siglercm/sb1000.html
+      http://web.archive.org/web/*/http://home.adelphia.net/~siglercm/sb1000.html
-      http://linuxpower.cx/~cable/
+      http://web.archive.org/web/*/http://linuxpower.cx/~cable/
   along with these utilities.
diff --git a/Documentation/networking/arcnet.txt b/Documentation/networking/arcnet.txt
index 796012540386..9ff579502151 100644
--- a/Documentation/networking/arcnet.txt
+++ b/Documentation/networking/arcnet.txt
@@ -68,7 +68,7 @@ REAL NAME" to listserv@tichy.ch.uj.edu.pl.  Then, to submit messages to the
 list, mail to linux-arcnet@tichy.ch.uj.edu.pl.
 There are archives of the mailing list at:
-        http://tichy.ch.uj.edu.pl/lists/linux-arcnet
+        http://epistolary.org/mailman/listinfo.cgi/arcnet
 The people on linux-net@vger.kernel.org have also been known to be very
 helpful, especially when we're talking about ALPHA Linux kernels that may or
@@ -79,7 +79,7 @@ Other Drivers and Info
 ----------------------
 You can try my ARCNET page on the World Wide Web at:
-        http://www.worldvisions.ca/~apenwarr/arcnet/
+        http://www.qis.net/~jschmitz/arcnet/    
 Also, SMC (one of the companies that makes ARCnet cards) has a WWW site you
 might be interested in, which includes several drivers for various cards
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 61f516b135b4..d2b62b71b617 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -49,6 +49,7 @@ Table of Contents
 3.3     Configuring Bonding Manually with Ifenslave
 3.3.1           Configuring Multiple Bonds Manually
 3.4     Configuring Bonding Manually via Sysfs
+3.5     Overriding Configuration for Special Cases
 4. Querying Bonding Configuration
 4.1     Bonding Configuration
@@ -1318,8 +1319,87 @@ echo 2000 > /sys/class/net/bond1/bonding/arp_interval
 echo +eth2 > /sys/class/net/bond1/bonding/slaves
 echo +eth3 > /sys/class/net/bond1/bonding/slaves
+3.5 Overriding Configuration for Special Cases
-4. Querying Bonding Configuration 
+----------------------------------------------
+When using the bonding driver, the physical port which transmits a frame is
+typically selected by the bonding driver, and is not relevant to the user or
+system administrator.  The output port is simply selected using the policies of
+the selected bonding mode.  On occasion however, it is helpful to direct certain
+classes of traffic to certain physical interfaces on output to implement
+slightly more complex policies.  For example, to reach a web server over a
+bonded interface in which eth0 connects to a private network, while eth1
+connects via a public network, it may be desirous to bias the bond to send said
+traffic over eth0 first, using eth1 only as a fall back, while all other traffic
+can safely be sent over either interface.  Such configurations may be achieved
+using the traffic control utilities inherent in linux.
+By default the bonding driver is multiqueue aware and 16 queues are created
+when the driver initializes (see Documentation/networking/multiqueue.txt
+for details).  If more or less queues are desired the module parameter
+tx_queues can be used to change this value.  There is no sysfs parameter
+available as the allocation is done at module init time.
+The output of the file /proc/net/bonding/bondX has changed so the output Queue
+ID is now printed for each slave:
+Bonding Mode: fault-tolerance (active-backup)
+Primary Slave: None
+Currently Active Slave: eth0
+MII Status: up
+MII Polling Interval (ms): 0
+Up Delay (ms): 0
+Down Delay (ms): 0
+Slave Interface: eth0
+MII Status: up
+Link Failure Count: 0
+Permanent HW addr: 00:1a:a0:12:8f:cb
+Slave queue ID: 0
+Slave Interface: eth1
+MII Status: up
+Link Failure Count: 0
+Permanent HW addr: 00:1a:a0:12:8f:cc
+Slave queue ID: 2
+The queue_id for a slave can be set using the command:
+# echo "eth1:2" > /sys/class/net/bond0/bonding/queue_id
+Any interface that needs a queue_id set should set it with multiple calls
+like the one above until proper priorities are set for all interfaces.  On
+distributions that allow configuration via initscripts, multiple 'queue_id'
+arguments can be added to BONDING_OPTS to set all needed slave queues.
+These queue id's can be used in conjunction with the tc utility to configure
+a multiqueue qdisc and filters to bias certain traffic to transmit on certain
+slave devices.  For instance, say we wanted, in the above configuration to
+force all traffic bound to 192.168.1.100 to use eth1 in the bond as its output
+device. The following commands would accomplish this:
+# tc qdisc add dev bond0 handle 1 root multiq
+# tc filter add dev bond0 protocol ip parent 1: prio 1 u32 match ip dst \
+        192.168.1.100 action skbedit queue_mapping 2
+These commands tell the kernel to attach a multiqueue queue discipline to the
+bond0 interface and filter traffic enqueued to it, such that packets with a dst
+ip of 192.168.1.100 have their output queue mapping value overwritten to 2.
+This value is then passed into the driver, causing the normal output path
+selection policy to be overridden, selecting instead qid 2, which maps to eth1.
+Note that qid values begin at 1.  Qid 0 is reserved to initiate to the driver
+that normal output policy selection should take place.  One benefit to simply
+leaving the qid for a slave to 0 is the multiqueue awareness in the bonding
+driver that is now present.  This awareness allows tc filters to be placed on
+slave devices as well as bond devices and the bonding driver will simply act as
+a pass-through for selecting output queues on the slave device rather than 
+output port selection.
+This feature first appeared in bonding driver version 3.7.0 and support for
+output slave selection was limited to round-robin and active-backup modes.
+4 Querying Bonding Configuration
 =================================
 4.1 Bonding Configuration
@@ -2432,7 +2512,7 @@ be found at:
 https://lists.sourceforge.net/lists/listinfo/bonding-devel
 Donald Becker's Ethernet Drivers and diag programs may be found at :
- - http://www.scyld.com/network/
+ - http://web.archive.org/web/*/http://www.scyld.com/network/ 
 You will also find a lot of information regarding Ethernet, NWay, MII,
 etc. at www.scyld.com.
diff --git a/Documentation/networking/caif/spi_porting.txt b/Documentation/networking/caif/spi_porting.txt
new file mode 100644
index 000000000000..61d7c9247453
--- /dev/null
+++ b/Documentation/networking/caif/spi_porting.txt
@@ -0,0 +1,208 @@
+- CAIF SPI porting -
+- CAIF SPI basics:
+Running CAIF over SPI needs some extra setup, owing to the nature of SPI.
+Two extra GPIOs have been added in order to negotiate the transfers
+ between the master and the slave. The minimum requirement for running
+CAIF over SPI is a SPI slave chip and two GPIOs (more details below).
+Please note that running as a slave implies that you need to keep up
+with the master clock. An overrun or underrun event is fatal.
+- CAIF SPI framework:
+To make porting as easy as possible, the CAIF SPI has been divided in
+two parts. The first part (called the interface part) deals with all
+generic functionality such as length framing, SPI frame negotiation
+and SPI frame delivery and transmission. The other part is the CAIF
+SPI slave device part, which is the module that you have to write if
+you want to run SPI CAIF on a new hardware. This part takes care of
+the physical hardware, both with regard to SPI and to GPIOs.
+- Implementing a CAIF SPI device:
+        - Functionality provided by the CAIF SPI slave device:
+        In order to implement a SPI device you will, as a minimum,
+        need to implement the following
+        functions:
+        int (*init_xfer) (struct cfspi_xfer * xfer, struct cfspi_dev *dev):
+        This function is called by the CAIF SPI interface to give
+        you a chance to set up your hardware to be ready to receive
+        a stream of data from the master. The xfer structure contains
+        both physical and logical adresses, as well as the total length
+        of the transfer in both directions.The dev parameter can be used
+        to map to different CAIF SPI slave devices.
+        void (*sig_xfer) (bool xfer, struct cfspi_dev *dev):
+        This function is called by the CAIF SPI interface when the output
+        (SPI_INT) GPIO needs to change state. The boolean value of the xfer
+        variable indicates whether the GPIO should be asserted (HIGH) or
+        deasserted (LOW). The dev parameter can be used to map to different CAIF
+        SPI slave devices.
+        - Functionality provided by the CAIF SPI interface:
+        void (*ss_cb) (bool assert, struct cfspi_ifc *ifc);
+        This function is called by the CAIF SPI slave device in order to
+        signal a change of state of the input GPIO (SS) to the interface.
+        Only active edges are mandatory to be reported.
+        This function can be called from IRQ context (recommended in order
+        not to introduce latency). The ifc parameter should be the pointer
+        returned from the platform probe function in the SPI device structure.
+        void (*xfer_done_cb) (struct cfspi_ifc *ifc);
+        This function is called by the CAIF SPI slave device in order to
+        report that a transfer is completed. This function should only be
+        called once both the transmission and the reception are completed.
+        This function can be called from IRQ context (recommended in order
+        not to introduce latency). The ifc parameter should be the pointer
+        returned from the platform probe function in the SPI device structure.
+        - Connecting the bits and pieces:
+                - Filling in the SPI slave device structure:
+                Connect the necessary callback functions.
+                Indicate clock speed (used to calculate toggle delays).
+                Chose a suitable name (helps debugging if you use several CAIF
+                SPI slave devices).
+                Assign your private data (can be used to map to your structure).
+                - Filling in the SPI slave platform device structure:
+                Add name of driver to connect to ("cfspi_sspi").
+                Assign the SPI slave device structure as platform data.
+- Padding:
+In order to optimize throughput, a number of SPI padding options are provided.
+Padding can be enabled independently for uplink and downlink transfers.
+Padding can be enabled for the head, the tail and for the total frame size.
+The padding needs to be correctly configured on both sides of the link.
+The padding can be changed via module parameters in cfspi_sspi.c or via
+the sysfs directory of the cfspi_sspi driver (before device registration).
+- CAIF SPI device template:
+/*
+ *      Copyright (C) ST-Ericsson AB 2010
+ *      Author: Daniel Martensson / Daniel.Martensson@stericsson.com
+ *      License terms: GNU General Public License (GPL), version 2.
+ *
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/wait.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <net/caif/caif_spi.h>
+MODULE_LICENSE("GPL");
+struct sspi_struct {
+        struct cfspi_dev sdev;
+        struct cfspi_xfer *xfer;
+};
+static struct sspi_struct slave;
+static struct platform_device slave_device;
+static irqreturn_t sspi_irq(int irq, void *arg)
+{
+        /* You only need to trigger on an edge to the active state of the
+         * SS signal. Once a edge is detected, the ss_cb() function should be
+         * called with the parameter assert set to true. It is OK
+         * (and even advised) to call the ss_cb() function in IRQ context in
+         * order not to add any delay. */
+        return IRQ_HANDLED;
+}
+static void sspi_complete(void *context)
+{
+        /* Normally the DMA or the SPI framework will call you back
+         * in something similar to this. The only thing you need to
+         * do is to call the xfer_done_cb() function, providing the pointer
+         * to the CAIF SPI interface. It is OK to call this function
+         * from IRQ context. */
+}
+static int sspi_init_xfer(struct cfspi_xfer *xfer, struct cfspi_dev *dev)
+{
+        /* Store transfer info. For a normal implementation you should
+         * set up your DMA here and make sure that you are ready to
+         * receive the data from the master SPI. */
+        struct sspi_struct *sspi = (struct sspi_struct *)dev->priv;
+        sspi->xfer = xfer;
+        return 0;
+}
+void sspi_sig_xfer(bool xfer, struct cfspi_dev *dev)
+{
+        /* If xfer is true then you should assert the SPI_INT to indicate to
+         * the master that you are ready to recieve the data from the master
+         * SPI. If xfer is false then you should de-assert SPI_INT to indicate
+         * that the transfer is done.
+         */
+        struct sspi_struct *sspi = (struct sspi_struct *)dev->priv;
+}
+static void sspi_release(struct device *dev)
+{
+        /*
+         * Here you should release your SPI device resources.
+         */
+}
+static int __init sspi_init(void)
+{
+        /* Here you should initialize your SPI device by providing the
+         * necessary functions, clock speed, name and private data. Once
+         * done, you can register your device with the
+         * platform_device_register() function. This function will return
+         * with the CAIF SPI interface initialized. This is probably also
+         * the place where you should set up your GPIOs, interrupts and SPI
+         * resources. */
+        int res = 0;
+        /* Initialize slave device. */
+        slave.sdev.init_xfer = sspi_init_xfer;
+        slave.sdev.sig_xfer = sspi_sig_xfer;
+        slave.sdev.clk_mhz = 13;
+        slave.sdev.priv = &slave;
+        slave.sdev.name = "spi_sspi";
+        slave_device.dev.release = sspi_release;
+        /* Initialize platform device. */
+        slave_device.name = "cfspi_sspi";
+        slave_device.dev.platform_data = &slave.sdev;
+        /* Register platform device. */
+        res = platform_device_register(&slave_device);
+        if (res) {
+                printk(KERN_WARNING "sspi_init: failed to register dev.\n");
+                return -ENODEV;
+        }
+        return res;
+}
+static void __exit sspi_exit(void)
+{
+        platform_device_del(&slave_device);
+}
+module_init(sspi_init);
+module_exit(sspi_exit);
diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index d8968958d839..e12a4900cf72 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -4,7 +4,7 @@
 1) Other documentation....
   o Project Home Pages
-       http://www.chygwyn.com/DECnet/                      - Kernel info
+       http://www.chygwyn.com/                              - Kernel info
       http://linux-decnet.sourceforge.net/                - Userland tools
       http://www.sourceforge.net/projects/linux-decnet/   - Status page
diff --git a/Documentation/networking/dns_resolver.txt b/Documentation/networking/dns_resolver.txt
new file mode 100644
index 000000000000..aefd1e681804
--- /dev/null
+++ b/Documentation/networking/dns_resolver.txt
@@ -0,0 +1,146 @@
+                             ===================
+                             DNS Resolver Module
+                             ===================
+Contents:
+ - Overview.
+ - Compilation.
+ - Setting up.
+ - Usage.
+ - Mechanism.
+ - Debugging.
+========
+OVERVIEW
+========
+The DNS resolver module provides a way for kernel services to make DNS queries
+by way of requesting a key of key type dns_resolver.  These queries are
+upcalled to userspace through /sbin/request-key.
+These routines must be supported by userspace tools dns.upcall, cifs.upcall and
+request-key.  It is under development and does not yet provide the full feature
+set.  The features it does support include:
+ (*) Implements the dns_resolver key_type to contact userspace.
+It does not yet support the following AFS features:
+ (*) Dns query support for AFSDB resource record.
+This code is extracted from the CIFS filesystem.
+===========
+COMPILATION
+===========
+The module should be enabled by turning on the kernel configuration options:
+        CONFIG_DNS_RESOLVER     - tristate "DNS Resolver support"
+==========
+SETTING UP
+==========
+To set up this facility, the /etc/request-key.conf file must be altered so that
+/sbin/request-key can appropriately direct the upcalls.  For example, to handle
+basic dname to IPv4/IPv6 address resolution, the following line should be
+added:
+        #OP     TYPE            DESC    CO-INFO PROGRAM ARG1 ARG2 ARG3 ...
+        #====== ============    ======= ======= ==========================
+        create  dns_resolver    *       *       /usr/sbin/cifs.upcall %k
+To direct a query for query type 'foo', a line of the following should be added
+before the more general line given above as the first match is the one taken.
+        create  dns_resolver    foo:*   *       /usr/sbin/dns.foo %k
+=====
+USAGE
+=====
+To make use of this facility, one of the following functions that are
+implemented in the module can be called after doing:
+        #include <linux/dns_resolver.h>
+ (1) int dns_query(const char *type, const char *name, size_t namelen,
+                   const char *options, char **_result, time_t *_expiry);
+     This is the basic access function.  It looks for a cached DNS query and if
+     it doesn't find it, it upcalls to userspace to make a new DNS query, which
+     may then be cached.  The key description is constructed as a string of the
+     form:
+                [<type>:]<name>
+     where <type> optionally specifies the particular upcall program to invoke,
+     and thus the type of query to do, and <name> specifies the string to be
+     looked up.  The default query type is a straight hostname to IP address
+     set lookup.
+     The name parameter is not required to be a NUL-terminated string, and its
+     length should be given by the namelen argument.
+     The options parameter may be NULL or it may be a set of options
+     appropriate to the query type.
+     The return value is a string appropriate to the query type.  For instance,
+     for the default query type it is just a list of comma-separated IPv4 and
+     IPv6 addresses.  The caller must free the result.
+     The length of the result string is returned on success, and a negative
+     error code is returned otherwise.  -EKEYREJECTED will be returned if the
+     DNS lookup failed.
+     If _expiry is non-NULL, the expiry time (TTL) of the result will be
+     returned also.
+=========
+MECHANISM
+=========
+The dnsresolver module registers a key type called "dns_resolver".  Keys of
+this type are used to transport and cache DNS lookup results from userspace.
+When dns_query() is invoked, it calls request_key() to search the local
+keyrings for a cached DNS result.  If that fails to find one, it upcalls to
+userspace to get a new result.
+Upcalls to userspace are made through the request_key() upcall vector, and are
+directed by means of configuration lines in /etc/request-key.conf that tell
+/sbin/request-key what program to run to instantiate the key.
+The upcall handler program is responsible for querying the DNS, processing the
+result into a form suitable for passing to the keyctl_instantiate_key()
+routine.  This then passes the data to dns_resolver_instantiate() which strips
+off and processes any options included in the data, and then attaches the
+remainder of the string to the key as its payload.
+The upcall handler program should set the expiry time on the key to that of the
+lowest TTL of all the records it has extracted a result from.  This means that
+the key will be discarded and recreated when the data it holds has expired.
+dns_query() returns a copy of the value attached to the key, or an error if
+that is indicated instead.
+See <file:Documentation/keys-request-key.txt> for further information about
+request-key function.
+=========
+DEBUGGING
+=========
+Debugging messages can be turned on dynamically by writing a 1 into the
+following file:
+        /sys/module/dnsresolver/parameters/debug
diff --git a/Documentation/networking/fore200e.txt b/Documentation/networking/fore200e.txt
index b1f337f0f4ca..6e0d2a9613ec 100644
--- a/Documentation/networking/fore200e.txt
+++ b/Documentation/networking/fore200e.txt
@@ -39,7 +39,7 @@ version. Alternative binary firmware images can be found somewhere on the
 ForeThought CD-ROM supplied with your adapter by FORE Systems.
 You can also get the latest firmware images from FORE Systems at
-http://www.fore.com. Register TACTics Online and go to
+http://en.wikipedia.org/wiki/FORE_Systems. Register TACTics Online and go to
 the 'software updates' pages. The firmware binaries are part of
 the various ForeThought software distributions.
diff --git a/Documentation/networking/igb.txt b/Documentation/networking/igb.txt
new file mode 100644
index 000000000000..ab2d71831892
--- /dev/null
+++ b/Documentation/networking/igb.txt
@@ -0,0 +1,132 @@
+Linux* Base Driver for Intel(R) Network Connection
+==================================================
+Intel Gigabit Linux driver.
+Copyright(c) 1999 - 2010 Intel Corporation.
+Contents
+========
+- Identifying Your Adapter
+- Additional Configurations
+- Support
+Identifying Your Adapter
+========================
+This driver supports all 82575, 82576 and 82580-based Intel (R) gigabit network
+connections.
+For specific information on how to identify your adapter, go to the Adapter &
+Driver ID Guide at:
+    http://support.intel.com/support/go/network/adapter/idguide.htm
+Command Line Parameters
+=======================
+The default value for each parameter is generally the recommended setting,
+unless otherwise noted.
+max_vfs
+-------
+Valid Range:   0-7
+Default Value: 0
+This parameter adds support for SR-IOV.  It causes the driver to spawn up to
+max_vfs worth of virtual function.
+Additional Configurations
+=========================
+  Jumbo Frames
+  ------------
+  Jumbo Frames support is enabled by changing the MTU to a value larger than
+  the default of 1500.  Use the ifconfig command to increase the MTU size.
+  For example:
+       ifconfig eth<x> mtu 9000 up
+  This setting is not saved across reboots.
+  Notes:
+  - The maximum MTU setting for Jumbo Frames is 9216.  This value coincides
+    with the maximum Jumbo Frames size of 9234 bytes.
+  - Using Jumbo Frames at 10 or 100 Mbps may result in poor performance or
+    loss of link.
+  Ethtool
+  -------
+  The driver utilizes the ethtool interface for driver configuration and
+  diagnostics, as well as displaying statistical information.
+  http://sourceforge.net/projects/gkernel.
+  Enabling Wake on LAN* (WoL)
+  ---------------------------
+  WoL is configured through the Ethtool* utility.
+  For instructions on enabling WoL with Ethtool, refer to the Ethtool man page.
+  WoL will be enabled on the system during the next shut down or reboot.
+  For this driver version, in order to enable WoL, the igb driver must be
+  loaded when shutting down or rebooting the system.
+  Wake On LAN is only supported on port A of multi-port adapters.
+  Wake On LAN is not supported for the Intel(R) Gigabit VT Quad Port Server
+  Adapter.
+  Multiqueue
+  ----------
+  In this mode, a separate MSI-X vector is allocated for each queue and one
+  for "other" interrupts such as link status change and errors.  All
+  interrupts are throttled via interrupt moderation.  Interrupt moderation
+  must be used to avoid interrupt storms while the driver is processing one
+  interrupt.  The moderation value should be at least as large as the expected
+  time for the driver to process an interrupt. Multiqueue is off by default.
+  REQUIREMENTS: MSI-X support is required for Multiqueue. If MSI-X is not
+  found, the system will fallback to MSI or to Legacy interrupts.
+  LRO
+  ---
+  Large Receive Offload (LRO) is a technique for increasing inbound throughput
+  of high-bandwidth network connections by reducing CPU overhead. It works by
+  aggregating multiple incoming packets from a single stream into a larger
+  buffer before they are passed higher up the networking stack, thus reducing
+  the number of packets that have to be processed. LRO combines multiple
+  Ethernet frames into a single receive in the stack, thereby potentially
+  decreasing CPU utilization for receives.
+  NOTE: You need to have inet_lro enabled via either the CONFIG_INET_LRO or
+  CONFIG_INET_LRO_MODULE kernel config option. Additionally, if
+  CONFIG_INET_LRO_MODULE is used, the inet_lro module needs to be loaded
+  before the igb driver.
+  You can verify that the driver is using LRO by looking at these counters in
+  Ethtool:
+  lro_aggregated - count of total packets that were combined
+  lro_flushed - counts the number of packets flushed out of LRO
+  lro_no_desc - counts the number of times an LRO descriptor was not available
+  for the LRO packet
+  NOTE: IPv6 and UDP are not supported by LRO.
+Support
+=======
+For general information, go to the Intel support website at:
+    www.intel.com/support/
+or the Intel Wired Networking project hosted by Sourceforge at:
+    http://sourceforge.net/projects/e1000
+If an issue is identified with the released source code on the supported
+kernel with a supported adapter, email the specific information related
+to the issue to e1000-devel@lists.sf.net
diff --git a/Documentation/networking/igbvf.txt b/Documentation/networking/igbvf.txt
new file mode 100644
index 000000000000..056028138d9c
--- /dev/null
+++ b/Documentation/networking/igbvf.txt
@@ -0,0 +1,78 @@
+Linux* Base Driver for Intel(R) Network Connection
+==================================================
+Intel Gigabit Linux driver.
+Copyright(c) 1999 - 2010 Intel Corporation.
+Contents
+========
+- Identifying Your Adapter
+- Additional Configurations
+- Support
+This file describes the igbvf Linux* Base Driver for Intel Network Connection.
+The igbvf driver supports 82576-based virtual function devices that can only
+be activated on kernels that support SR-IOV. SR-IOV requires the correct
+platform and OS support.
+The igbvf driver requires the igb driver, version 2.0 or later. The igbvf
+driver supports virtual functions generated by the igb driver with a max_vfs
+value of 1 or greater. For more information on the max_vfs parameter refer
+to the README included with the igb driver.
+The guest OS loading the igbvf driver must support MSI-X interrupts.
+This driver is only supported as a loadable module at this time.  Intel is
+not supplying patches against the kernel source to allow for static linking
+of the driver.  For questions related to hardware requirements, refer to the
+documentation supplied with your Intel Gigabit adapter.  All hardware
+requirements listed apply to use with Linux.
+Instructions on updating ethtool can be found in the section "Additional
+Configurations" later in this document.
+VLANs: There is a limit of a total of 32 shared VLANs to 1 or more VFs.
+Identifying Your Adapter
+========================
+The igbvf driver supports 82576-based virtual function devices that can only
+be activated on kernels that support SR-IOV.
+For more information on how to identify your adapter, go to the Adapter &
+Driver ID Guide at:
+    http://support.intel.com/support/go/network/adapter/idguide.htm
+For the latest Intel network drivers for Linux, refer to the following
+website.  In the search field, enter your adapter name or type, or use the
+networking link on the left to search for your adapter:
+    http://downloadcenter.intel.com/scripts-df-external/Support_Intel.aspx
+Additional Configurations
+=========================
+  Ethtool
+  -------
+  The driver utilizes the ethtool interface for driver configuration and
+  diagnostics, as well as displaying statistical information.
+  http://sourceforge.net/projects/gkernel.
+Support
+=======
+For general information, go to the Intel support website at:
+    http://support.intel.com
+or the Intel Wired Networking project hosted by Sourceforge at:
+    http://sourceforge.net/projects/e1000
+If an issue is identified with the released source code on the supported
+kernel with a supported adapter, email the specific information related
+to the issue to e1000-devel@lists.sf.net
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index d0536b5a4e01..f350c69b2bb4 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -903,7 +903,7 @@ arp_ignore - INTEGER
 arp_notify - BOOLEAN
        Define mode for notification of address and device changes.
        0 - (default): do nothing
-        1 - Generate gratuitous arp replies when device is brought up
+        1 - Generate gratuitous arp requests when device is brought up
            or hardware address changes.
 arp_accept - BOOLEAN
diff --git a/Documentation/networking/ipddp.txt b/Documentation/networking/ipddp.txt
index 661a5558dd8e..ba5c217fffe0 100644
--- a/Documentation/networking/ipddp.txt
+++ b/Documentation/networking/ipddp.txt
@@ -36,11 +36,6 @@ AppleTalk-IP to IP decapsulation.
 Basic instructions for user space tools
 =======================================
-To enable AppleTalk-IP decapsulation/encapsulation you will need the 
-proper tools. You can get the tools for decapsulation from
-http://spacs1.spacs.k12.wi.us/~jschlst/index.html and for encapsulation
-from http://www.maths.unm.edu/~bradford/ltpc.html
 I will briefly describe the operation of the tools, but you will
 need to consult the supporting documentation for each set of tools.
diff --git a/Documentation/networking/iphase.txt b/Documentation/networking/iphase.txt
index 55eac4a784e2..670b72f16585 100644
--- a/Documentation/networking/iphase.txt
+++ b/Documentation/networking/iphase.txt
@@ -22,7 +22,7 @@ The features and limitations of this driver are as follows:
    - All variants of Interphase ATM PCI (i)Chip adapter cards are supported, 
      including x575 (OC3, control memory 128K , 512K and packet memory 128K, 
      512K and 1M), x525 (UTP25) and x531 (DS3 and E3). See 
-      http://www.iphase.com/site/iphase-web/?epi_menuItemID=e196f04b4b3b40502f150882e21046a0
+      http://www.iphase.com/
      for details.
    - Only x86 platforms are supported.
    - SMP is supported.
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index 98f71a5cef00..073894d1c093 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -8,7 +8,7 @@ capture network traffic with utilities like tcpdump or any other that needs
 raw access to network interface.
 You can find the latest version of this document at:
-    http://pusa.uv.es/~ulisses/packet_mmap/
+    http://wiki.ipxwarzone.com/index.php5?title=Linux_packet_mmap
 Howto can be found at:
    http://wiki.gnu-log.net (packet_mmap)
@@ -56,7 +56,7 @@ support for PACKET_MMAP, and also probably the libpcap included in your distribu
 I'm aware of two implementations of PACKET_MMAP in libpcap:
-    http://pusa.uv.es/~ulisses/packet_mmap/  (by Simon Patarin, based on libpcap 0.6.2)
+    http://wiki.ipxwarzone.com/              (by Simon Patarin, based on libpcap 0.6.2)
    http://public.lanl.gov/cpw/              (by Phil Wood, based on lastest libpcap)
 The rest of this document is intended for people who want to understand
@@ -493,6 +493,32 @@ The user can also use poll() to check if a buffer is available:
    pfd.events = POLLOUT;
    retval = poll(&pfd, 1, timeout);
+-------------------------------------------------------------------------------
+ PACKET_TIMESTAMP
+-------------------------------------------------------------------------------
+The PACKET_TIMESTAMP setting determines the source of the timestamp in
+the packet meta information.  If your NIC is capable of timestamping
+packets in hardware, you can request those hardware timestamps to used.
+Note: you may need to enable the generation of hardware timestamps with
+SIOCSHWTSTAMP.
+PACKET_TIMESTAMP accepts the same integer bit field as
+SO_TIMESTAMPING.  However, only the SOF_TIMESTAMPING_SYS_HARDWARE
+and SOF_TIMESTAMPING_RAW_HARDWARE values are recognized by
+PACKET_TIMESTAMP.  SOF_TIMESTAMPING_SYS_HARDWARE takes precedence over
+SOF_TIMESTAMPING_RAW_HARDWARE if both bits are set.
+    int req = 0;
+    req |= SOF_TIMESTAMPING_SYS_HARDWARE;
+    setsockopt(fd, SOL_PACKET, PACKET_TIMESTAMP, (void *) &req, sizeof(req))
+If PACKET_TIMESTAMP is not set, a software timestamp generated inside
+the networking stack is used (the behavior before this setting was added).
+See include/linux/net_tstamp.h and Documentation/networking/timestamping
+for more information on hardware timestamps.
 --------------------------------------------------------------------------------
 + THANKS
 --------------------------------------------------------------------------------
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index 61bb645d50e0..75e4fd708ccb 100644
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -151,6 +151,8 @@ Examples:
 pgset stop               aborts injection. Also, ^C aborts generator.
+ pgset "rate 300M"        set rate to 300 Mb/s
+ pgset "ratep 1000000"    set rate to 1Mpps
 Example scripts
 ===============
@@ -241,6 +243,9 @@ src6
 flows
 flowlen
+rate
+ratep
 References:
 ftp://robur.slu.se/pub/Linux/net-development/pktgen-testing/
 ftp://robur.slu.se/pub/Linux/net-development/pktgen-testing/examples/
diff --git a/Documentation/networking/ray_cs.txt b/Documentation/networking/ray_cs.txt
index 145d27a52395..c0c12307ed9d 100644
--- a/Documentation/networking/ray_cs.txt
+++ b/Documentation/networking/ray_cs.txt
@@ -13,8 +13,8 @@ wireless LAN cards.
 As of kernel 2.3.18, the ray_cs driver is part of the Linux kernel
 source.  My web page for the development of ray_cs is at
-http://world.std.com/~corey/raylink.html and I can be emailed at
+http://web.ralinktech.com/ralink/Home/Support/Linux.html 
-corey@world.std.com
+and I can be emailed at corey@world.std.com
 The kernel driver is based on ray_cs-1.62.tgz
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index c3d6b4d5d014..9d4e0f4df5a8 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -133,7 +133,8 @@ bring down CPU utilization.
 ** For AMD opteron platforms with 8131 chipset, MMRBC=1 and MOST=1 are 
 recommended as safe parameters.
 For more information, please review the AMD8131 errata at
-http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26310.pdf
+http://vip.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/
+26310_AMD-8131_HyperTransport_PCI-X_Tunnel_Revision_Guide_rev_3_18.pdf
 6.  Available Downloads
 Neterion "s2io" driver in Red Hat and Suse 2.6-based distributions is kept up 
diff --git a/Documentation/networking/tlan.txt b/Documentation/networking/tlan.txt
index 7e6aa5b20c37..34550dfcef74 100644
--- a/Documentation/networking/tlan.txt
+++ b/Documentation/networking/tlan.txt
@@ -2,7 +2,7 @@
 (C) 1998 James Banks
 (C) 1999-2001 Torben Mathiasen <tmm@image.dk, torben.mathiasen@compaq.com>
-For driver information/updates visit http://opensource.compaq.com
+For driver information/updates visit http://www.compaq.com
 TLAN driver for Linux, version 1.14a
@@ -113,5 +113,5 @@ III.  Things to try if you have problems.
 There is also a tlan mailing list which you can join by sending "subscribe tlan"
 in the body of an email to majordomo@vuser.vu.union.edu.
-There is also a tlan website at http://opensource.compaq.com
+There is also a tlan website at http://www.compaq.com
diff --git a/Documentation/networking/udplite.txt b/Documentation/networking/udplite.txt
index 855d8da57a23..d727a3829100 100644
--- a/Documentation/networking/udplite.txt
+++ b/Documentation/networking/udplite.txt
@@ -11,11 +11,13 @@
  This file briefly describes the existing kernel support and the socket API.
  For in-depth information, you can consult:
-   o The UDP-Lite Homepage: http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/
+   o The UDP-Lite Homepage:
+        http://web.archive.org/web/*/http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/ 
       From here you can also download some example application source code.
   o The UDP-Lite HOWTO on
-       http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/UDP-Lite-HOWTO.txt
+       http://web.archive.org/web/*/http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/
+        files/UDP-Lite-HOWTO.txt
   o The Wireshark UDP-Lite WiKi (with capture files):
       http://wiki.wireshark.org/Lightweight_User_Datagram_Protocol
@@ -26,12 +28,7 @@
  I) APPLICATIONS
  Several applications have been ported successfully to UDP-Lite. Ethereal
-  (now called wireshark) has UDP-Litev4/v6 support by default. The tarball on
+  (now called wireshark) has UDP-Litev4/v6 support by default. 
-   http://www.erg.abdn.ac.uk/users/gerrit/udp-lite/files/udplite_linux.tar.gz
-  has source code for several v4/v6 client-server and network testing examples.
  Porting applications to UDP-Lite is straightforward: only socket level and
  IPPROTO need to be changed; senders additionally set the checksum coverage
  length (default = header length = 8). Details are in the next section.
diff --git a/Documentation/networking/wavelan.txt b/Documentation/networking/wavelan.txt
deleted file mode 100644
index afa6e521c685..000000000000
--- a/Documentation/networking/wavelan.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-        The Wavelan drivers saga
-        ------------------------
-        By Jean Tourrilhes <jt@hpl.hp.com>
-        The Wavelan is a Radio network adapter designed by
-Lucent. Under this generic name is hidden quite a variety of hardware,
-and many Linux driver to support it.
-        The get the full story on Wireless LANs, please consult :
-                http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-"wavelan" driver (old ISA Wavelan)
----------------
-        o Config :      Network device -> Wireless LAN -> AT&T WaveLAN
-        o Location :    .../drivers/net/wireless/wavelan*
-        o in-line doc : .../drivers/net/wireless/wavelan.p.h
-        o on-line doc :
-            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
-        This is the driver for the ISA version of the first generation
-of the Wavelan, now discontinued. The device is 2 Mb/s, composed of a
-Intel 82586 controller and a Lucent Modem, and is NOT 802.11 compliant.
-        The driver has been tested with the following hardware :
-        o Wavelan ISA 915 MHz (full length ISA card) 
-        o Wavelan ISA 915 MHz 2.0 (half length ISA card) 
-        o Wavelan ISA 2.4 GHz (full length ISA card, fixed frequency) 
-        o Wavelan ISA 2.4 GHz 2.0 (half length ISA card, frequency selectable) 
-        o Above cards with the optional DES encryption feature 
-"wavelan_cs" driver (old Pcmcia Wavelan)
-------------------
-        o Config :      Network device -> PCMCIA network ->
-                                Pcmcia Wireless LAN -> AT&T/Lucent WaveLAN
-        o Location :    .../drivers/net/pcmcia/wavelan*
-        o in-line doc : .../drivers/net/pcmcia/wavelan_cs.h
-        o on-line doc :
-            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html
-        This is the driver for the PCMCIA version of the first
-generation of the Wavelan, now discontinued. The device is 2 Mb/s,
-composed of a Intel 82593 controller (totally different from the 82586)
-and a Lucent Modem, and NOT 802.11 compatible.
-        The driver has been tested with the following hardware :
-        o Wavelan Pcmcia 915 MHz 2.0 (Pcmcia card + separate
-                                        modem/antenna block) 
-        o Wavelan Pcmcia 2.4 GHz 2.0 (Pcmcia card + separate
-                                        modem/antenna block) 
-"wvlan_cs" driver (Wavelan IEEE, GPL)
-----------------
-        o Config :      Not yet in kernel
-        o Location :    Pcmcia package 3.1.10+
-        o on-line doc : http://www.fasta.fh-dortmund.de/users/andy/wvlan/
-        This is the driver for the current generation of Wavelan IEEE,
-which is 802.11 compatible. Depending on version, it is 2 Mb/s or 11
-Mb/s, with or without encryption, all implemented in Lucent specific
-DSP (the Hermes).
-        This is a GPL full source PCMCIA driver (ISA is just a Pcmcia
-card with ISA-Pcmcia bridge).
-"wavelan2_cs" driver (Wavelan IEEE, binary)
--------------------
-        o Config :      Not yet in kernel
-        o Location :    ftp://sourceforge.org/pcmcia/contrib/
-        This driver support exactly the same hardware as the previous
-driver, the main difference is that it is based on a binary library
-and supported by Lucent.
-        I hope it clears the confusion ;-)
-        Jean
diff --git a/Documentation/padata.txt b/Documentation/padata.txt
index 269d7d0d8335..7ddfe216a0aa 100644
--- a/Documentation/padata.txt
+++ b/Documentation/padata.txt
@@ -1,5 +1,5 @@
 The padata parallel execution mechanism
-Last updated for 2.6.34
+Last updated for 2.6.36
 Padata is a mechanism by which the kernel can farm work out to be done in
 parallel on multiple CPUs while retaining the ordering of tasks.  It was
@@ -13,31 +13,86 @@ overall control of how tasks are to be run:
    #include <linux/padata.h>
-    struct padata_instance *padata_alloc(const struct cpumask *cpumask,
+    struct padata_instance *padata_alloc(struct workqueue_struct *wq,
-                                         struct workqueue_struct *wq);
+                                         const struct cpumask *pcpumask,
+                                         const struct cpumask *cbcpumask);
-The cpumask describes which processors will be used to execute work
+The pcpumask describes which processors will be used to execute work
-submitted to this instance.  The workqueue wq is where the work will
+submitted to this instance in parallel. The cbcpumask defines which
-actually be done; it should be a multithreaded queue, naturally.
+processors are allowed to be used as the serialization callback processor.
+The workqueue wq is where the work will actually be done; it should be
+a multithreaded queue, naturally.
+To allocate a padata instance with the cpu_possible_mask for both
+cpumasks this helper function can be used:
+    struct padata_instance *padata_alloc_possible(struct workqueue_struct *wq);
+Note: Padata maintains two kinds of cpumasks internally. The user supplied
+cpumasks, submitted by padata_alloc/padata_alloc_possible and the 'usable'
+cpumasks. The usable cpumasks are always a subset of active CPUs in the
+user supplied cpumasks; these are the cpumasks padata actually uses. So
+it is legal to supply a cpumask to padata that contains offline CPUs.
+Once an offline CPU in the user supplied cpumask comes online, padata
+is going to use it.
 There are functions for enabling and disabling the instance:
-    void padata_start(struct padata_instance *pinst);
+    int padata_start(struct padata_instance *pinst);
    void padata_stop(struct padata_instance *pinst);
-These functions literally do nothing beyond setting or clearing the
+These functions are setting or clearing the "PADATA_INIT" flag;
-"padata_start() was called" flag; if that flag is not set, other functions
+if that flag is not set, other functions will refuse to work.
-will refuse to work.
+padata_start returns zero on success (flag set) or -EINVAL if the
+padata cpumask contains no active CPU (flag not set).
+padata_stop clears the flag and blocks until the padata instance
+is unused.
 The list of CPUs to be used can be adjusted with these functions:
-    int padata_set_cpumask(struct padata_instance *pinst,
+    int padata_set_cpumasks(struct padata_instance *pinst,
+                            cpumask_var_t pcpumask,
+                            cpumask_var_t cbcpumask);
+    int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type,
                           cpumask_var_t cpumask);
-    int padata_add_cpu(struct padata_instance *pinst, int cpu);
+    int padata_add_cpu(struct padata_instance *pinst, int cpu, int mask);
-    int padata_remove_cpu(struct padata_instance *pinst, int cpu);
+    int padata_remove_cpu(struct padata_instance *pinst, int cpu, int mask);
+Changing the CPU masks are expensive operations, though, so it should not be
+done with great frequency.
+It's possible to change both cpumasks of a padata instance with
+padata_set_cpumasks by specifying the cpumasks for parallel execution (pcpumask)
+and for the serial callback function (cbcpumask). padata_set_cpumask is used to
+change just one of the cpumasks. Here cpumask_type is one of PADATA_CPU_SERIAL,
+PADATA_CPU_PARALLEL and cpumask specifies the new cpumask to use.
+To simply add or remove one CPU from a certain cpumask the functions
+padata_add_cpu/padata_remove_cpu are used. cpu specifies the CPU to add or
+remove and mask is one of PADATA_CPU_SERIAL, PADATA_CPU_PARALLEL.
+If a user is interested in padata cpumask changes, he can register to
+the padata cpumask change notifier:
+    int padata_register_cpumask_notifier(struct padata_instance *pinst,
+                                         struct notifier_block *nblock);
+To unregister from that notifier:
+    int padata_unregister_cpumask_notifier(struct padata_instance *pinst,
+                                           struct notifier_block *nblock);
+The padata cpumask change notifier notifies about changes of the usable
+cpumasks, i.e. the subset of active CPUs in the user supplied cpumask.
+Padata calls the notifier chain with:
+    blocking_notifier_call_chain(&pinst->cpumask_change_notifier,
+                                 notification_mask,
+                                 &pd_new->cpumask);
-Changing the CPU mask has the look of an expensive operation, though, so it
+Here cpumask_change_notifier is registered notifier, notification_mask
-probably should not be done with great frequency.
+is one of PADATA_CPU_SERIAL, PADATA_CPU_PARALLEL and cpumask is a pointer
+to a struct padata_cpumask that contains the new cpumask information.
 Actually submitting work to the padata instance requires the creation of a
 padata_priv structure:
@@ -49,8 +104,8 @@ padata_priv structure:
    };
 This structure will almost certainly be embedded within some larger
-structure specific to the work to be done.  Most its fields are private to
+structure specific to the work to be done.  Most of its fields are private to
-padata, but the structure should be zeroed at initialization time, and the
+padata, but the structure should be zeroed at initialisation time, and the
 parallel() and serial() functions should be provided.  Those functions will
 be called in the process of getting the work done as we will see
 momentarily.
@@ -63,12 +118,10 @@ The submission of work is done with:
 The pinst and padata structures must be set up as described above; cb_cpu
 specifies which CPU will be used for the final callback when the work is
 done; it must be in the current instance's CPU mask.  The return value from
-padata_do_parallel() is a little strange; zero is an error return
+padata_do_parallel() is zero on success, indicating that the work is in
-indicating that the caller forgot the padata_start() formalities.  -EBUSY
+progress. -EBUSY means that somebody, somewhere else is messing with the
-means that somebody, somewhere else is messing with the instance's CPU
+instance's CPU mask, while -EINVAL is a complaint about cb_cpu not being
-mask, while -EINVAL is a complaint about cb_cpu not being in that CPU mask.
+in that CPU mask or about a not running instance.
-If all goes well, this function will return -EINPROGRESS, indicating that
-the work is in progress.
 Each task submitted to padata_do_parallel() will, in turn, be passed to
 exactly one call to the above-mentioned parallel() function, on one CPU, so
diff --git a/Documentation/pcmcia/driver-changes.txt b/Documentation/pcmcia/driver-changes.txt
index 61bc4e943116..26c0f9c00545 100644
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
@@ -1,4 +1,16 @@
 This file details changes in 2.6 which affect PCMCIA card driver authors:
+* pcmcia_request_io changes (as of 2.6.36)
+   Instead of io_req_t, drivers are now requested to fill out
+   struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
+   ranges. After a call to pcmcia_request_io(), the ports found there
+   are reserved, after calling pcmcia_request_configuration(), they may
+   be used.
+* No dev_info_t, no cs_types.h (as of 2.6.36)
+   dev_info_t and a few other typedefs are removed. No longer use them
+   in PCMCIA device drivers. Also, do not include pcmcia/cs_types.h, as
+   this file is gone.
 * No dev_node_t (as of 2.6.35)
   There is no more need to fill out a "dev_node_t" structure.
diff --git a/Documentation/power/apm-acpi.txt b/Documentation/power/apm-acpi.txt
index 1bd799dc17e8..6cc423d3662e 100644
--- a/Documentation/power/apm-acpi.txt
+++ b/Documentation/power/apm-acpi.txt
@@ -28,5 +28,5 @@ and be sure that they are started sometime in the system boot process.
 Go ahead and start both.  If ACPI or APM is not available on your
 system the associated daemon will exit gracefully.
-  apmd:   http://worldvisions.ca/~apenwarr/apmd/
+  apmd:   http://ftp.debian.org/pool/main/a/apmd/
  acpid:  http://acpid.sf.net/
diff --git a/Documentation/power/basic-pm-debugging.txt b/Documentation/power/basic-pm-debugging.txt
index 1555001bc733..ddd78172ef73 100644
--- a/Documentation/power/basic-pm-debugging.txt
+++ b/Documentation/power/basic-pm-debugging.txt
@@ -179,8 +179,7 @@ use the PM_TRACE mechanism documented in Documentation/s2ram.txt .
 To verify that the STR works, it is generally more convenient to use the s2ram
 tool available from http://suspend.sf.net and documented at
-http://en.opensuse.org/s2ram .  However, before doing that it is recommended to
+http://en.opensuse.org/SDB:Suspend_to_RAM.
-carry out STR testing using the facility described in section 1.
 Namely, after writing "freezer", "devices", "platform", "processors", or "core"
 into /sys/power/pm_test (available if the kernel is compiled with
diff --git a/Documentation/power/tricks.txt b/Documentation/power/tricks.txt
index 3b26bb502a4a..a1b8f7249f4c 100644
--- a/Documentation/power/tricks.txt
+++ b/Documentation/power/tricks.txt
@@ -1,6 +1,6 @@
        swsusp/S3 tricks
        ~~~~~~~~~~~~~~~~
-Pavel Machek <pavel@suse.cz>
+Pavel Machek <pavel@ucw.cz>
 If you want to trick swsusp/S3 into working, you might want to try:
diff --git a/Documentation/power/video.txt b/Documentation/power/video.txt
index 2b358498d095..3e6272bc4472 100644
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
@@ -67,11 +67,11 @@ There are a few types of systems where video works after S3 resume:
  POSTing bios works. Ole Rohne has patch to do just that at
  http://dev.gentoo.org/~marineam/patch-radeonfb-2.6.11-rc2-mm2.
-(8) on some systems, you can use the video_post utility mentioned here:
+(8) on some systems, you can use the video_post utility and or 
-  http://bugzilla.kernel.org/show_bug.cgi?id=3670. Do echo 3 > /sys/power/state
+  do echo 3 > /sys/power/state  && /usr/sbin/video_post - which will 
-  && /usr/sbin/video_post - which will initialize the display in console mode.
+  initialize the display in console mode. If you are in X, you can switch
-  If  you are in X, you can switch to a virtual terminal and back to X using
+  to a virtual terminal and back to X using  CTRL+ALT+F1 - CTRL+ALT+F7 to get
-  CTRL+ALT+F1 - CTRL+ALT+F7 to get the display working in graphical mode again.
+  the display working in graphical mode again.
 Now, if you pass acpi_sleep=something, and it does not work with your
 bios, you'll get a hard crash during resume. Be careful. Also it is
@@ -177,7 +177,7 @@ Mainboard	    Graphics card                 hack (or "how to do it")
 Asus A7V8X          nVidia RIVA TNT2 model 64     s3_bios,s3_mode (4)
-(*) from http://www.ubuntulinux.org/wiki/HoaryPMResults, not sure
+(*) from https://wiki.ubuntu.com/HoaryPMResults, not sure
    which options to use. If you know, please tell me.
 (***) To be tested with a newer kernel.
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 46d22105aa07..568fa08e82e5 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1048,7 +1048,7 @@ IV - "dtc", the device tree compiler
 dtc source code can be found at
-<http://ozlabs.org/~dgibson/dtc/dtc.tar.gz>
+<http://git.jdl.com/gitweb/?p=dtc.git>
 WARNING: This version is still in early development stage; the
 resulting device-tree "blobs" have not yet been validated with the
diff --git a/Documentation/powerpc/dts-bindings/fsl/diu.txt b/Documentation/powerpc/dts-bindings/fsl/diu.txt
index deb35de70988..b66cb6d31d69 100644
--- a/Documentation/powerpc/dts-bindings/fsl/diu.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/diu.txt
@@ -4,10 +4,17 @@ The Freescale DIU is a LCD controller, with proper hardware, it can also
 drive DVI monitors.
 Required properties:
- compatible : should be "fsl-diu".
+- compatible : should be "fsl,diu" or "fsl,mpc5121-diu".
 - reg : should contain at least address and length of the DIU register
  set.
- Interrupts : one DIU interrupt should be describe here.
+- interrupts : one DIU interrupt should be described here.
+- interrupt-parent : the phandle for the interrupt controller that
+  services interrupts for this device.
+Optional properties:
+- edid : verbatim EDID data block describing attached display.
+  Data from the detailed timing descriptor will be used to
+  program the display controller.
 Example (MPC8610HPCD):
        display@2c000 {
@@ -16,3 +23,12 @@ Example (MPC8610HPCD):
                interrupts = <72 2>;
                interrupt-parent = <&mpic>;
        };
+Example for MPC5121:
+        display@2100 {
+                compatible = "fsl,mpc5121-diu";
+                reg = <0x2100 0x100>;
+                interrupts = <64 0x8>;
+                interrupt-parent = <&ipic>;
+                edid = [edid-data];
+        };
diff --git a/Documentation/powerpc/dts-bindings/fsl/esdhc.txt b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
index 8a0040738969..64bcb8be973c 100644
--- a/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/esdhc.txt
@@ -14,6 +14,8 @@ Required properties:
    reports inverted write-protect state;
  - sdhci,1-bit-only : (optional) specifies that a controller can
    only handle 1-bit data transfers.
+  - sdhci,auto-cmd12: (optional) specifies that a controller can
+    only handle auto CMD12.
 Example:
diff --git a/Documentation/powerpc/dts-bindings/fsl/i2c.txt b/Documentation/powerpc/dts-bindings/fsl/i2c.txt
index 50da20310585..1eacd6b20ed5 100644
--- a/Documentation/powerpc/dts-bindings/fsl/i2c.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/i2c.txt
@@ -20,6 +20,7 @@ Recommended properties :
 - fsl,preserve-clocking : boolean; if defined, the clock settings
   from the bootloader are preserved (not touched).
 - clock-frequency : desired I2C bus clock frequency in Hz.
+ - fsl,timeout : I2C bus timeout in microseconds.
 Examples :
@@ -59,4 +60,5 @@ Examples :
                interrupts = <43 2>;
                interrupt-parent = <&mpic>;
                clock-frequency = <400000>;
+                fsl,timeout = <10000>;
        };
diff --git a/Documentation/rt-mutex-design.txt b/Documentation/rt-mutex-design.txt
index 8df0b782c4d7..33ed8007a845 100644
--- a/Documentation/rt-mutex-design.txt
+++ b/Documentation/rt-mutex-design.txt
@@ -364,7 +364,7 @@ process this is rather easy to know what needs to be adjusted.
 The functions implementing the task adjustments are rt_mutex_adjust_prio,
 __rt_mutex_adjust_prio (same as the former, but expects the task pi_lock
-to already be taken), rt_mutex_get_prio, and rt_mutex_setprio.
+to already be taken), rt_mutex_getprio, and rt_mutex_setprio.
 rt_mutex_getprio and rt_mutex_setprio are only used in __rt_mutex_adjust_prio.
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt
index 1eb576a023bd..86f9f74b2b34 100644
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -2531,5 +2531,5 @@ Special Thanks
 ==============
 Special thanks to Neale Ferguson who maintains a much
 prettier HTML version of this page at
-http://penguinvm.princeton.edu/notes.html#Debug390
+http://linuxvm.org/penguinvm/
 Bob Grainger Stefan Bader & others for reporting bugs
diff --git a/Documentation/scsi/BusLogic.txt b/Documentation/scsi/BusLogic.txt
index 98023baa0f0d..d7fbc9488b98 100644
--- a/Documentation/scsi/BusLogic.txt
+++ b/Documentation/scsi/BusLogic.txt
@@ -47,7 +47,7 @@ tune driver performance and error recovery to their particular needs.
 The latest information on Linux support for BusLogic SCSI Host Adapters, as
 well as the most recent release of this driver and the latest firmware for the
 BT-948/958/958D, will always be available from my Linux Home Page at URL
-"http://www.dandelion.com/Linux/".
+"http://sourceforge.net/projects/dandelion/".
 Bug reports should be sent via electronic mail to "lnz@dandelion.com".  Please
 include with the bug report the complete configuration messages reported by the
diff --git a/Documentation/scsi/ChangeLog.lpfc b/Documentation/scsi/ChangeLog.lpfc
index e759e92e286d..337c924cc81f 100644
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
@@ -807,7 +807,7 @@ Changes from 20040908 to 20040920
          lpfc_disc_done/lpfc_do_dpc cleanup - lpfc_disc_done can return
          void - move lpfc_do_dpc and lpfc_disc_done to lpfc_hbadisc.c -
          remove checking of list emptiness before calling lpfc_disc_done,
-          it handles the emtpy list case just fine and the additional
+          it handles the empty list case just fine and the additional
          instructions cost less then the bustlocked spinlock operations.
        * Integrated patch from Christoph Hellwig: This adds a new 64bit
          counter instead, brd_no isn't reused anymore.  Also some tiny
diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid
index 38e9e7cadc90..5e07d320817d 100644
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
@@ -215,7 +215,7 @@ Older Version	: 2.20.4.5 (scsi module), 2.20.2.5 (cmm module)
 3.      Convert pci_module_init to pci_register_driver
        Convert from pci_module_init to pci_register_driver
-        (from:http://kerneljanitors.org/TODO)
+        (from:http://kernelnewbies.org/KernelJanitors/TODO)
                - Signed-off-by: Domen Puncer <domen@coderock.org>
 4.      Use the pre defined DMA mask constants from dma-mapping.h
diff --git a/Documentation/scsi/FlashPoint.txt b/Documentation/scsi/FlashPoint.txt
index 1540a92f6d2b..5b5f29cb9f8b 100644
--- a/Documentation/scsi/FlashPoint.txt
+++ b/Documentation/scsi/FlashPoint.txt
@@ -13,7 +13,7 @@ operating system support to its BusLogic brand of FlashPoint Ultra SCSI
 host adapters.  All of BusLogic's other SCSI host adapters, including the
 MultiMaster line, currently support the Linux operating system.  Linux
 drivers and information will be available on October 15th at
-http://www.dandelion.com/Linux/.
+http://sourceforge.net/projects/dandelion/.
 "Mylex is committed to supporting the Linux community," says Peter Shambora,
 vice president of marketing for Mylex.  "We have supported Linux driver
@@ -27,7 +27,7 @@ Linux is a freely-distributed implementation of UNIX for Intel x86, Sun
 SPARC, SGI MIPS, Motorola 68k, Digital Alpha AXP and Motorola PowerPC
 machines.  It supports a wide range of software, including the X Window
 System, Emacs, and TCP/IP networking.  Further information is available at
-http://www.linux.org and http://www.ssc.com/linux.
+http://www.linux.org and http://www.ssc.com/.
 FlashPoint Host Adapters
diff --git a/Documentation/scsi/Mylex.txt b/Documentation/scsi/Mylex.txt
index cdf69293f7d5..3797f3e6c2b5 100644
--- a/Documentation/scsi/Mylex.txt
+++ b/Documentation/scsi/Mylex.txt
@@ -2,4 +2,4 @@ Please see the file README.BusLogic for information about Linux support for
 Mylex (formerly BusLogic) MultiMaster and FlashPoint SCSI Host Adapters.
 The Mylex DAC960 PCI RAID Controllers are now supported.  Please consult
-http://www.dandelion.com/Linux/ for further information on the DAC960 driver.
+http://sourceforge.net/projects/dandelion for further information on the DAC960 driver.
diff --git a/Documentation/scsi/NinjaSCSI.txt b/Documentation/scsi/NinjaSCSI.txt
index 3229b64cf24e..ac8db8ceec77 100644
--- a/Documentation/scsi/NinjaSCSI.txt
+++ b/Documentation/scsi/NinjaSCSI.txt
@@ -3,8 +3,6 @@
 1. Comment
 This is Workbit corp.'s(http://www.workbit.co.jp/) NinjaSCSI-3
-(http://www.workbit.co.jp/ts/z_nj3r.html) and NinjaSCSI-32Bi
-(http://www.workbit.co.jp/ts/z_njsc32bi.html) PCMCIA card driver module
 for Linux.
 2. My Linux environment
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt
index c014eccaf19f..16e054c9c70b 100644
--- a/Documentation/scsi/aic79xx.txt
+++ b/Documentation/scsi/aic79xx.txt
@@ -447,7 +447,7 @@ The following information is available in this file:
      http://www.adaptec.com/buy-cables/.
   Europe
-    - Visit our Web site at http://www.adaptec-europe.com/.
+    - Visit our Web site at http://www.adaptec.com/en-US/_common/world_index.
    - To speak with a Technical Support Specialist, call, or email,
      * German:  +49 89 4366 5522, Monday-Friday, 9:00-17:00 CET,
        http://ask-de.adaptec.com/.
diff --git a/Documentation/scsi/aic7xxx.txt b/Documentation/scsi/aic7xxx.txt
index b7e238cbb5a7..18f8d1905e6a 100644
--- a/Documentation/scsi/aic7xxx.txt
+++ b/Documentation/scsi/aic7xxx.txt
@@ -344,7 +344,7 @@ The following information is available in this file:
      http://www.adaptec.com/buy-cables/.
   Europe
-    - Visit our Web site at http://www.adaptec-europe.com/.
+    - Visit our Web site at http://www.adaptec.com/en-US/_common/world_index.
    - To speak with a Technical Support Specialist, call, or email,
      * German:  +49 89 4366 5522, Monday-Friday, 9:00-17:00 CET,
        http://ask-de.adaptec.com/.
diff --git a/Documentation/scsi/hpsa.txt b/Documentation/scsi/hpsa.txt
new file mode 100644
index 000000000000..dca658362cbf
--- /dev/null
+++ b/Documentation/scsi/hpsa.txt
@@ -0,0 +1,107 @@
+HPSA - Hewlett Packard Smart Array driver
+-----------------------------------------
+This file describes the hpsa SCSI driver for HP Smart Array controllers.
+The hpsa driver is intended to supplant the cciss driver for newer
+Smart Array controllers.  The hpsa driver is a SCSI driver, while the
+cciss driver is a "block" driver.  Actually cciss is both a block
+driver (for logical drives) AND a SCSI driver (for tape drives). This
+"split-brained" design of the cciss driver is a source of excess
+complexity and eliminating that complexity is one of the reasons
+for hpsa to exist.
+Supported devices:
+------------------
+Smart Array P212
+Smart Array P410
+Smart Array P410i
+Smart Array P411
+Smart Array P812
+Smart Array P712m
+Smart Array P711m
+StorageWorks P1210m
+Additionally, older Smart Arrays may work with the hpsa driver if the kernel
+boot parameter "hpsa_allow_any=1" is specified, however these are not tested
+nor supported by HP with this driver.  For older Smart Arrays, the cciss
+driver should still be used.
+HPSA specific entries in /sys
+-----------------------------
+  In addition to the generic SCSI attributes available in /sys, hpsa supports
+  the following attributes:
+  HPSA specific host attributes:
+  ------------------------------
+  /sys/class/scsi_host/host*/rescan
+  /sys/class/scsi_host/host*/firmware_revision
+  the host "rescan" attribute is a write only attribute.  Writing to this
+  attribute will cause the driver to scan for new, changed, or removed devices
+  (e.g. hot-plugged tape drives, or newly configured or deleted logical drives,
+  etc.) and notify the SCSI midlayer of any changes detected.  Normally this is
+  triggered automatically by HP's Array Configuration Utility (either the GUI or
+  command line variety) so for logical drive changes, the user should not
+  normally have to use this.  It may be useful when hot plugging devices like
+  tape drives, or entire storage boxes containing pre-configured logical drives.
+  The "firmware_revision" attribute contains the firmware version of the Smart Array.
+  For example:
+        root@host:/sys/class/scsi_host/host4# cat firmware_revision
+        7.14
+  HPSA specific disk attributes:
+  ------------------------------
+  /sys/class/scsi_disk/c:b:t:l/device/unique_id
+  /sys/class/scsi_disk/c:b:t:l/device/raid_level
+  /sys/class/scsi_disk/c:b:t:l/device/lunid
+  (where c:b:t:l are the controller, bus, target and lun of the device)
+  For example:
+        root@host:/sys/class/scsi_disk/4:0:0:0/device# cat unique_id
+        600508B1001044395355323037570F77
+        root@host:/sys/class/scsi_disk/4:0:0:0/device# cat lunid
+        0x0000004000000000
+        root@host:/sys/class/scsi_disk/4:0:0:0/device# cat raid_level
+        RAID 0
+HPSA specific ioctls:
+---------------------
+  For compatibility with applications written for the cciss driver, many, but
+  not all of the ioctls supported by the cciss driver are also supported by the
+  hpsa driver.  The data structures used by these are described in
+  include/linux/cciss_ioctl.h
+  CCISS_DEREGDISK
+  CCISS_REGNEWDISK
+  CCISS_REGNEWD
+  The above three ioctls all do exactly the same thing, which is to cause the driver
+  to rescan for new devices.  This does exactly the same thing as writing to the
+  hpsa specific host "rescan" attribute.
+  CCISS_GETPCIINFO
+        Returns PCI domain, bus, device and function and "board ID" (PCI subsystem ID).
+  CCISS_GETDRIVVER
+        Returns driver version in three bytes encoded as:
+                (major_version << 16) | (minor_version << 8) | (subminor_version)
+  CCISS_PASSTHRU
+  CCISS_BIG_PASSTHRU
+        Allows "BMIC" and "CISS" commands to be passed through to the Smart Array.
+        These are used extensively by the HP Array Configuration Utility, SNMP storage
+        agents, etc.  See cciss_vol_status at http://cciss.sf.net for some examples.
diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt
index 3920f28710c4..45d61ad8c6f7 100644
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
@@ -1109,7 +1109,7 @@
     Q: Where can I find the latest info about this driver?
     A: See the file MAINTAINERS for the current WWW-address, which offers
        updates, info and Q/A lists. At this file's origin, the webaddress
-        was: http://www.uni-mainz.de/~langm000/linux.html
+        was: http://www.staff.uni-mainz.de/mlang/linux.html
     Q: My SCSI-adapter is not recognized by the driver, what can I do?
     A: Just force it to be recognized by kernel parameters. See section 5.1.
        If this really happens, do also send e-mail to the maintainer, as
diff --git a/Documentation/scsi/osst.txt b/Documentation/scsi/osst.txt
index 2b21890bc983..ad86c6d1e898 100644
--- a/Documentation/scsi/osst.txt
+++ b/Documentation/scsi/osst.txt
@@ -135,7 +135,7 @@ The driver development is coordinated through a mailing list
 a CVS repository and some web pages. 
 The tester's pages which contain recent news and updated drivers to download
 can be found on
-http://linux1.onstream.nl/test/
+http://sourceforge.net/projects/osst/
 If you find any problems, please have a look at the tester's page in order
 to see whether the problem is already known and solved. Otherwise, please
diff --git a/Documentation/scsi/ppa.txt b/Documentation/scsi/ppa.txt
index 067ac394e0b2..05ff47dbe8d1 100644
--- a/Documentation/scsi/ppa.txt
+++ b/Documentation/scsi/ppa.txt
@@ -1,13 +1,13 @@
 -------- Terse where to get ZIP Drive help info --------
 General Iomega ZIP drive page for Linux:
-http://www.torque.net/~campbell/
+http://web.archive.org/web/*/http://www.torque.net/~campbell/
 Driver archive for old drivers:
-http://www.torque.net/~campbell/ppa/
+http://web.archive.org/web/*/http://www.torque.net/~campbell/ppa
 Linux Parport page (parallel port)
-http://www.torque.net/parport/
+http://web.archive.org/web/*/http://www.torque.net/parport/
 Email list for Linux Parport
 linux-parport@torque.net
diff --git a/Documentation/scsi/scsi-generic.txt b/Documentation/scsi/scsi-generic.txt
index c38e2b3648e4..0a22ab8ea0c1 100644
--- a/Documentation/scsi/scsi-generic.txt
+++ b/Documentation/scsi/scsi-generic.txt
@@ -34,11 +34,11 @@ http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO
 This describes the sg version 3 driver found in the lk 2.4 series.
 The LDP renders documents in single and multiple page HTML, postscript
 and pdf. This document can also be found at:
-http://www.torque.net/sg/p/sg_v3_ho.html
+http://sg.danny.cz/sg/p/sg_v3_ho.html
 Documentation for the version 2 sg driver found in the lk 2.2 series can
-be found at http://www.torque.net/sg/p/scsi-generic.txt . A larger version
+be found at http://sg.danny.cz/sg/. A larger version
-is at:  http://www.torque.net/sg/p/scsi-generic_long.txt .
+is at: http://sg.danny.cz/sg/p/scsi-generic_long.txt.
 The original documentation for the sg driver (prior to lk 2.2.6) can be
 found at http://www.torque.net/sg/p/original/SCSI-Programming-HOWTO.txt
@@ -61,7 +61,7 @@ There are two packages of sg utilities:
  - sg_utils    for the sg version 2 (and original) driver found in lk 2.2
                and earlier
 Both packages will work in the lk 2.4 series however sg3_utils offers more
-capabilities. They can be found at: http://www.torque.net/sg and 
+capabilities. They can be found at: http://sg.danny.cz/sg/sg3_utils.html and 
 freshmeat.net
 Another approach is to look at the applications that use the sg driver.
diff --git a/Documentation/scsi/scsi-parameters.txt b/Documentation/scsi/scsi-parameters.txt
new file mode 100644
index 000000000000..21e5798526ee
--- /dev/null
+++ b/Documentation/scsi/scsi-parameters.txt
@@ -0,0 +1,139 @@
+                          SCSI Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~~
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+        advansys=       [HW,SCSI]
+                        See header of drivers/scsi/advansys.c.
+        aha152x=        [HW,SCSI]
+                        See Documentation/scsi/aha152x.txt.
+        aha1542=        [HW,SCSI]
+                        Format: <portbase>[,<buson>,<busoff>[,<dmaspeed>]]
+        aic7xxx=        [HW,SCSI]
+                        See Documentation/scsi/aic7xxx.txt.
+        aic79xx=        [HW,SCSI]
+                        See Documentation/scsi/aic79xx.txt.
+        atascsi=        [HW,SCSI] Atari SCSI
+        BusLogic=       [HW,SCSI]
+                        See drivers/scsi/BusLogic.c, comment before function
+                        BusLogic_ParseDriverOptions().
+        dtc3181e=       [HW,SCSI]
+        eata=           [HW,SCSI]
+        fd_mcs=         [HW,SCSI]
+                        See header of drivers/scsi/fd_mcs.c.
+        fdomain=        [HW,SCSI]
+                        See header of drivers/scsi/fdomain.c.
+        gdth=           [HW,SCSI]
+                        See header of drivers/scsi/gdth.c.
+        gvp11=          [HW,SCSI]
+        ibmmcascsi=     [HW,MCA,SCSI] IBM MicroChannel SCSI adapter
+                        See Documentation/mca.txt.
+        in2000=         [HW,SCSI]
+                        See header of drivers/scsi/in2000.c.
+        ips=            [HW,SCSI] Adaptec / IBM ServeRAID controller
+                        See header of drivers/scsi/ips.c.
+        mac5380=        [HW,SCSI] Format:
+                        <can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
+        max_luns=       [SCSI] Maximum number of LUNs to probe.
+                        Should be between 1 and 2^32-1.
+        max_report_luns=
+                        [SCSI] Maximum number of LUNs received.
+                        Should be between 1 and 16384.
+        NCR_D700=       [HW,SCSI]
+                        See header of drivers/scsi/NCR_D700.c.
+        ncr5380=        [HW,SCSI]
+        ncr53c400=      [HW,SCSI]
+        ncr53c400a=     [HW,SCSI]
+        ncr53c406a=     [HW,SCSI]
+        ncr53c8xx=      [HW,SCSI]
+        nodisconnect    [HW,SCSI,M68K] Disables SCSI disconnects.
+        osst=           [HW,SCSI] SCSI Tape Driver
+                        Format: <buffer_size>,<write_threshold>
+                        See also Documentation/scsi/st.txt.
+        pas16=          [HW,SCSI]
+                        See header of drivers/scsi/pas16.c.
+        scsi_debug_*=   [SCSI]
+                        See drivers/scsi/scsi_debug.c.
+        scsi_default_dev_flags=
+                        [SCSI] SCSI default device flags
+                        Format: <integer>
+        scsi_dev_flags= [SCSI] Black/white list entry for vendor and model
+                        Format: <vendor>:<model>:<flags>
+                        (flags are integer value)
+        scsi_logging_level=     [SCSI] a bit mask of logging levels
+                        See drivers/scsi/scsi_logging.h for bits.  Also
+                        settable via sysctl at dev.scsi.logging_level
+                        (/proc/sys/dev/scsi/logging_level).
+                        There is also a nice 'scsi_logging_level' script in the
+                        S390-tools package, available for download at
+                        http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
+        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
+                        discovered.  async scans them in kernel threads,
+                        allowing boot to proceed.  none ignores them, expecting
+                        user space to do the scan.
+        sim710=         [SCSI,HW]
+                        See header of drivers/scsi/sim710.c.
+        st=             [HW,SCSI] SCSI tape parameters (buffers, etc.)
+                        See Documentation/scsi/st.txt.
+        sym53c416=      [HW,SCSI]
+                        See header of drivers/scsi/sym53c416.c.
+        t128=           [HW,SCSI]
+                        See header of drivers/scsi/t128.c.
+        tmscsim=        [HW,SCSI]
+                        See comment before function dc390_setup() in
+                        drivers/scsi/tmscsim.c.
+        u14-34f=        [HW,SCSI] UltraStor 14F/34F SCSI host adapter
+                        See header of drivers/scsi/u14-34f.c.
+        wd33c93=        [HW,SCSI]
+                        See header of drivers/scsi/wd33c93.c.
+        wd7000=         [HW,SCSI]
+                        See header of drivers/scsi/wd7000.c.
diff --git a/Documentation/scsi/scsi.txt b/Documentation/scsi/scsi.txt
index dd1bbf4e98e3..3d99d38cb62a 100644
--- a/Documentation/scsi/scsi.txt
+++ b/Documentation/scsi/scsi.txt
@@ -4,8 +4,8 @@ The Linux Documentation Project (LDP) maintains a document describing
 the SCSI subsystem in the Linux kernel (lk) 2.4 series. See:
 http://www.tldp.org/HOWTO/SCSI-2.4-HOWTO . The LDP has single
 and multiple page HTML renderings as well as postscript and pdf.
-It can also be found at http://www.torque.net/scsi/SCSI-2.4-HOWTO .
+It can also be found at:
+http://web.archive.org/web/*/http://www.torque.net/scsi/SCSI-2.4-HOWTO
 Notes on using modules in the SCSI subsystem
 ============================================
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index de67229251d8..570ef2b3d79b 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -43,7 +43,7 @@ There is a SCSI documentation directory within the kernel source tree,
 typically Documentation/scsi . Most documents are in plain
 (i.e. ASCII) text. This file is named scsi_mid_low_api.txt and can be 
 found in that directory. A more recent copy of this document may be found
-at http://www.torque.net/scsi/scsi_mid_low_api.txt.gz . 
+at http://web.archive.org/web/20070107183357rn_1/sg.torque.net/scsi/. 
 Many LLDs are documented there (e.g. aic7xxx.txt). The SCSI mid-level is
 briefly described in scsi.txt which contains a url to a document 
 describing the SCSI subsystem in the lk 2.4 series. Two upper level 
diff --git a/Documentation/serial/moxa-smartio b/Documentation/serial/moxa-smartio
index 5337e80a5b96..d10443918684 100644
--- a/Documentation/serial/moxa-smartio
+++ b/Documentation/serial/moxa-smartio
@@ -76,7 +76,7 @@ Content
   GNU General Public License in this version. Please refer to GNU General
   Public License announcement in each source code file for more detail.
-   In Moxa's Web sites, you may always find latest driver at http://web.moxa.com.
+   In Moxa's Web sites, you may always find latest driver at http://www.moxa.com/.
   This version of driver can be installed as Loadable Module (Module driver)
   or built-in into kernel (Static driver). You may refer to following
diff --git a/Documentation/slow-work.txt b/Documentation/slow-work.txt
deleted file mode 100644
index 9dbf4470c7e1..000000000000
--- a/Documentation/slow-work.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-                     ====================================
-                     SLOW WORK ITEM EXECUTION THREAD POOL
-                     ====================================
-By: David Howells <dhowells@redhat.com>
-The slow work item execution thread pool is a pool of threads for performing
-things that take a relatively long time, such as making mkdir calls.
-Typically, when processing something, these items will spend a lot of time
-blocking a thread on I/O, thus making that thread unavailable for doing other
-work.
-The standard workqueue model is unsuitable for this class of work item as that
-limits the owner to a single thread or a single thread per CPU.  For some
-tasks, however, more threads - or fewer - are required.
-There is just one pool per system.  It contains no threads unless something
-wants to use it - and that something must register its interest first.  When
-the pool is active, the number of threads it contains is dynamic, varying
-between a maximum and minimum setting, depending on the load.
-====================
-CLASSES OF WORK ITEM
-====================
-This pool support two classes of work items:
- (*) Slow work items.
- (*) Very slow work items.
-The former are expected to finish much quicker than the latter.
-An operation of the very slow class may do a batch combination of several
-lookups, mkdirs, and a create for instance.
-An operation of the ordinarily slow class may, for example, write stuff or
-expand files, provided the time taken to do so isn't too long.
-Operations of both types may sleep during execution, thus tying up the thread
-loaned to it.
-A further class of work item is available, based on the slow work item class:
- (*) Delayed slow work items.
-These are slow work items that have a timer to defer queueing of the item for
-a while.
-THREAD-TO-CLASS ALLOCATION
--------------------------
-Not all the threads in the pool are available to work on very slow work items.
-The number will be between one and one fewer than the number of active threads.
-This is configurable (see the "Pool Configuration" section).
-All the threads are available to work on ordinarily slow work items, but a
-percentage of the threads will prefer to work on very slow work items.
-The configuration ensures that at least one thread will be available to work on
-very slow work items, and at least one thread will be available that won't work
-on very slow work items at all.
-=====================
-USING SLOW WORK ITEMS
-=====================
-Firstly, a module or subsystem wanting to make use of slow work items must
-register its interest:
-         int ret = slow_work_register_user(struct module *module);
-This will return 0 if successful, or a -ve error upon failure.  The module
-pointer should be the module interested in using this facility (almost
-certainly THIS_MODULE).
-Slow work items may then be set up by:
- (1) Declaring a slow_work struct type variable:
-        #include <linux/slow-work.h>
-        struct slow_work myitem;
- (2) Declaring the operations to be used for this item:
-        struct slow_work_ops myitem_ops = {
-                .get_ref = myitem_get_ref,
-                .put_ref = myitem_put_ref,
-                .execute = myitem_execute,
-        };
-     [*] For a description of the ops, see section "Item Operations".
- (3) Initialising the item:
-        slow_work_init(&myitem, &myitem_ops);
-     or:
-        delayed_slow_work_init(&myitem, &myitem_ops);
-     or:
-        vslow_work_init(&myitem, &myitem_ops);
-     depending on its class.
-A suitably set up work item can then be enqueued for processing:
-        int ret = slow_work_enqueue(&myitem);
-This will return a -ve error if the thread pool is unable to gain a reference
-on the item, 0 otherwise, or (for delayed work):
-        int ret = delayed_slow_work_enqueue(&myitem, my_jiffy_delay);
-The items are reference counted, so there ought to be no need for a flush
-operation.  But as the reference counting is optional, means to cancel
-existing work items are also included:
-        cancel_slow_work(&myitem);
-        cancel_delayed_slow_work(&myitem);
-can be used to cancel pending work.  The above cancel function waits for
-existing work to have been executed (or prevent execution of them, depending
-on timing).
-When all a module's slow work items have been processed, and the
-module has no further interest in the facility, it should unregister its
-interest:
-        slow_work_unregister_user(struct module *module);
-The module pointer is used to wait for all outstanding work items for that
-module before completing the unregistration.  This prevents the put_ref() code
-from being taken away before it completes.  module should almost certainly be
-THIS_MODULE.
-================
-HELPER FUNCTIONS
-================
-The slow-work facility provides a function by which it can be determined
-whether or not an item is queued for later execution:
-        bool queued = slow_work_is_queued(struct slow_work *work);
-If it returns false, then the item is not on the queue (it may be executing
-with a requeue pending).  This can be used to work out whether an item on which
-another depends is on the queue, thus allowing a dependent item to be queued
-after it.
-If the above shows an item on which another depends not to be queued, then the
-owner of the dependent item might need to wait.  However, to avoid locking up
-the threads unnecessarily be sleeping in them, it can make sense under some
-circumstances to return the work item to the queue, thus deferring it until
-some other items have had a chance to make use of the yielded thread.
-To yield a thread and defer an item, the work function should simply enqueue
-the work item again and return.  However, this doesn't work if there's nothing
-actually on the queue, as the thread just vacated will jump straight back into
-the item's work function, thus busy waiting on a CPU.
-Instead, the item should use the thread to wait for the dependency to go away,
-but rather than using schedule() or schedule_timeout() to sleep, it should use
-the following function:
-        bool requeue = slow_work_sleep_till_thread_needed(
-                        struct slow_work *work,
-                        signed long *_timeout);
-This will add a second wait and then sleep, such that it will be woken up if
-either something appears on the queue that could usefully make use of the
-thread - and behind which this item can be queued, or if the event the caller
-set up to wait for happens.  True will be returned if something else appeared
-on the queue and this work function should perhaps return, of false if
-something else woke it up.  The timeout is as for schedule_timeout().
-For example:
-        wq = bit_waitqueue(&my_flags, MY_BIT);
-        init_wait(&wait);
-        requeue = false;
-        do {
-                prepare_to_wait(wq, &wait, TASK_UNINTERRUPTIBLE);
-                if (!test_bit(MY_BIT, &my_flags))
-                        break;
-                requeue = slow_work_sleep_till_thread_needed(&my_work,
-                                                             &timeout);
-        } while (timeout > 0 && !requeue);
-        finish_wait(wq, &wait);
-        if (!test_bit(MY_BIT, &my_flags)
-                goto do_my_thing;
-        if (requeue)
-                return; // to slow_work
-===============
-ITEM OPERATIONS
-===============
-Each work item requires a table of operations of type struct slow_work_ops.
-Only ->execute() is required; the getting and putting of a reference and the
-describing of an item are all optional.
- (*) Get a reference on an item:
-        int (*get_ref)(struct slow_work *work);
-     This allows the thread pool to attempt to pin an item by getting a
-     reference on it.  This function should return 0 if the reference was
-     granted, or a -ve error otherwise.  If an error is returned,
-     slow_work_enqueue() will fail.
-     The reference is held whilst the item is queued and whilst it is being
-     executed.  The item may then be requeued with the same reference held, or
-     the reference will be released.
- (*) Release a reference on an item:
-        void (*put_ref)(struct slow_work *work);
-     This allows the thread pool to unpin an item by releasing the reference on
-     it.  The thread pool will not touch the item again once this has been
-     called.
- (*) Execute an item:
-        void (*execute)(struct slow_work *work);
-     This should perform the work required of the item.  It may sleep, it may
-     perform disk I/O and it may wait for locks.
- (*) View an item through /proc:
-        void (*desc)(struct slow_work *work, struct seq_file *m);
-     If supplied, this should print to 'm' a small string describing the work
-     the item is to do.  This should be no more than about 40 characters, and
-     shouldn't include a newline character.
-     See the 'Viewing executing and queued items' section below.
-==================
-POOL CONFIGURATION
-==================
-The slow-work thread pool has a number of configurables:
- (*) /proc/sys/kernel/slow-work/min-threads
-     The minimum number of threads that should be in the pool whilst it is in
-     use.  This may be anywhere between 2 and max-threads.
- (*) /proc/sys/kernel/slow-work/max-threads
-     The maximum number of threads that should in the pool.  This may be
-     anywhere between min-threads and 255 or NR_CPUS * 2, whichever is greater.
- (*) /proc/sys/kernel/slow-work/vslow-percentage
-     The percentage of active threads in the pool that may be used to execute
-     very slow work items.  This may be between 1 and 99.  The resultant number
-     is bounded to between 1 and one fewer than the number of active threads.
-     This ensures there is always at least one thread that can process very
-     slow work items, and always at least one thread that won't.
-==================================
-VIEWING EXECUTING AND QUEUED ITEMS
-==================================
-If CONFIG_SLOW_WORK_DEBUG is enabled, a debugfs file is made available:
-        /sys/kernel/debug/slow_work/runqueue
-through which the list of work items being executed and the queues of items to
-be executed may be viewed.  The owner of a work item is given the chance to
-add some information of its own.
-The contents look something like the following:
-    THR PID   ITEM ADDR        FL MARK  DESC
-    === ===== ================ == ===== ==========
-      0  3005 ffff880023f52348  a 952ms FSC: OBJ17d3: LOOK
-      1  3006 ffff880024e33668  2 160ms FSC: OBJ17e5 OP60d3b: Write1/Store fl=2
-      2  3165 ffff8800296dd180  a 424ms FSC: OBJ17e4: LOOK
-      3  4089 ffff8800262c8d78  a 212ms FSC: OBJ17ea: CRTN
-      4  4090 ffff88002792bed8  2 388ms FSC: OBJ17e8 OP60d36: Write1/Store fl=2
-      5  4092 ffff88002a0ef308  2 388ms FSC: OBJ17e7 OP60d2e: Write1/Store fl=2
-      6  4094 ffff88002abaf4b8  2 132ms FSC: OBJ17e2 OP60d4e: Write1/Store fl=2
-      7  4095 ffff88002bb188e0  a 388ms FSC: OBJ17e9: CRTN
-    vsq     - ffff880023d99668  1 308ms FSC: OBJ17e0 OP60f91: Write1/EnQ fl=2
-    vsq     - ffff8800295d1740  1 212ms FSC: OBJ16be OP4d4b6: Write1/EnQ fl=2
-    vsq     - ffff880025ba3308  1 160ms FSC: OBJ179a OP58dec: Write1/EnQ fl=2
-    vsq     - ffff880024ec83e0  1 160ms FSC: OBJ17ae OP599f2: Write1/EnQ fl=2
-    vsq     - ffff880026618e00  1 160ms FSC: OBJ17e6 OP60d33: Write1/EnQ fl=2
-    vsq     - ffff880025a2a4b8  1 132ms FSC: OBJ16a2 OP4d583: Write1/EnQ fl=2
-    vsq     - ffff880023cbe6d8  9 212ms FSC: OBJ17eb: LOOK
-    vsq     - ffff880024d37590  9 212ms FSC: OBJ17ec: LOOK
-    vsq     - ffff880027746cb0  9 212ms FSC: OBJ17ed: LOOK
-    vsq     - ffff880024d37ae8  9 212ms FSC: OBJ17ee: LOOK
-    vsq     - ffff880024d37cb0  9 212ms FSC: OBJ17ef: LOOK
-    vsq     - ffff880025036550  9 212ms FSC: OBJ17f0: LOOK
-    vsq     - ffff8800250368e0  9 212ms FSC: OBJ17f1: LOOK
-    vsq     - ffff880025036aa8  9 212ms FSC: OBJ17f2: LOOK
-In the 'THR' column, executing items show the thread they're occupying and
-queued threads indicate which queue they're on.  'PID' shows the process ID of
-a slow-work thread that's executing something.  'FL' shows the work item flags.
-'MARK' indicates how long since an item was queued or began executing.  Lastly,
-the 'DESC' column permits the owner of an item to give some information.
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 2075bbb8b3e2..7f4dcebda9c6 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1285,7 +1285,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    about this driver.  Note that it has been discontinued, but the 
    Voyetra Turtle Beach knowledge base entry for it is still available
    at
-        http://www.turtlebeach.com/site/kb_ftp/790.asp
+        http://www.turtlebeach.com
  Module snd-msnd-pinnacle
  ------------------------
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 1d38b0dfba95..ce46fa1e643e 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -83,8 +83,8 @@ ALC269
 ======
  basic         Basic preset
  quanta        Quanta FL1
-  eeepc-p703    ASUS Eeepc P703 P900A
+  laptop-amic   Laptops with analog-mic input
-  eeepc-p901    ASUS Eeepc P901 S101
+  laptop-dmic   Laptops with digital-mic input
  fujitsu       FSC Amilo
  lifebook      Fujitsu Lifebook S6420
  auto          auto-config reading BIOS (default)
@@ -109,11 +109,18 @@ ALC662/663/272
  asus-mode4    ASUS
  asus-mode5    ASUS
  asus-mode6    ASUS
+  asus-mode7    ASUS
+  asus-mode8    ASUS
  dell          Dell with ALC272
  dell-zm1      Dell ZM1 with ALC272
  samsung-nc10  Samsung NC10 mini notebook
  auto          auto-config reading BIOS (default)
+ALC680
+======
+  base          Base model (ASUS NX90)
+  auto          auto-config reading BIOS (default)
 ALC882/883/885/888/889
 ======================
  3stack-dig    3-jack with SPDIF I/O
@@ -282,6 +289,7 @@ Conexant 5051
  hp            HP Spartan laptop
  hp-dv6736     HP dv6736
  hp-f700       HP Compaq Presario F700
+  ideapad       Lenovo IdeaPad laptop
  lenovo-x200   Lenovo X200 laptop
  toshiba       Toshiba Satellite M300
@@ -289,8 +297,10 @@ Conexant 5066
 =============
  laptop        Basic Laptop config (default)
  dell-laptop   Dell laptops
+  dell-vostro   Dell Vostro
  olpc-xo-1_5   OLPC XO 1.5
  ideapad       Lenovo IdeaPad U150
+  thinkpad      Lenovo Thinkpad
 STAC9200
 ========
@@ -398,6 +408,7 @@ STAC92HD83*
  mic-ref       Reference board with power management for ports
  dell-s14      Dell laptop
  hp            HP laptops with (inverted) mute-LED
+  hp-dv7-4000   HP dv-7 4000
  auto          BIOS setup (default)
 STAC9872
@@ -410,3 +421,7 @@ Cirrus Logic CS4206/4207
  mbp55         MacBook Pro 5,5
  imac27        IMac 27 Inch
  auto          BIOS setup (default)
+VIA VT17xx/VT18xx/VT20xx
+========================
+  auto          BIOS setup (default)
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index bdafdbd32561..278cc2122ea0 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -562,7 +562,7 @@ compare the codec registers directly.
 Send a bug report either the followings:
 kernel-bugzilla::
-  http://bugme.linux-foundation.org/
+  https://bugzilla.kernel.org/
 alsa-devel ML::
  alsa-devel@alsa-project.org
diff --git a/Documentation/sound/alsa/Procfile.txt b/Documentation/sound/alsa/Procfile.txt
index 07301de12cc4..7fcd1ad96fcc 100644
--- a/Documentation/sound/alsa/Procfile.txt
+++ b/Documentation/sound/alsa/Procfile.txt
@@ -103,6 +103,8 @@ card*/pcm*/xrun_debug
          bit 2 = Enable additional jiffies check
          bit 3 = Log hwptr update at each period interrupt
          bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()
+          bit 5 = Show last 10 positions on error
+          bit 6 = Do above only once
        When the bit 0 is set, the driver will show the messages to
        kernel log when an xrun is detected.  The debug message is
@@ -122,6 +124,12 @@ card*/pcm*/xrun_debug
        Bits 3 and 4 are for logging the hwptr records.  Note that
        these will give flood of kernel messages.
+        When bit 5 is set, the driver logs the last 10 xrun errors and
+        the proc file shows each jiffies, position, period_size,
+        buffer_size, old_hw_ptr, and hw_ptr_base values.
+        When bit 6 is set, the full xrun log is shown only once.
 card*/pcm*/sub*/info
        The general information of this PCM sub-stream.
diff --git a/Documentation/sound/alsa/alsa-parameters.txt b/Documentation/sound/alsa/alsa-parameters.txt
new file mode 100644
index 000000000000..0fa40679b080
--- /dev/null
+++ b/Documentation/sound/alsa/alsa-parameters.txt
@@ -0,0 +1,135 @@
+                          ALSA Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~~
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+        snd-ad1816a=    [HW,ALSA]
+        snd-ad1848=     [HW,ALSA]
+        snd-ali5451=    [HW,ALSA]
+        snd-als100=     [HW,ALSA]
+        snd-als4000=    [HW,ALSA]
+        snd-azt2320=    [HW,ALSA]
+        snd-cmi8330=    [HW,ALSA]
+        snd-cmipci=     [HW,ALSA]
+        snd-cs4231=     [HW,ALSA]
+        snd-cs4232=     [HW,ALSA]
+        snd-cs4236=     [HW,ALSA]
+        snd-cs4281=     [HW,ALSA]
+        snd-cs46xx=     [HW,ALSA]
+        snd-dt019x=     [HW,ALSA]
+        snd-dummy=      [HW,ALSA]
+        snd-emu10k1=    [HW,ALSA]
+        snd-ens1370=    [HW,ALSA]
+        snd-ens1371=    [HW,ALSA]
+        snd-es968=      [HW,ALSA]
+        snd-es1688=     [HW,ALSA]
+        snd-es18xx=     [HW,ALSA]
+        snd-es1938=     [HW,ALSA]
+        snd-es1968=     [HW,ALSA]
+        snd-fm801=      [HW,ALSA]
+        snd-gusclassic= [HW,ALSA]
+        snd-gusextreme= [HW,ALSA]
+        snd-gusmax=     [HW,ALSA]
+        snd-hdsp=       [HW,ALSA]
+        snd-ice1712=    [HW,ALSA]
+        snd-intel8x0=   [HW,ALSA]
+        snd-interwave=  [HW,ALSA]
+        snd-interwave-stb=
+                        [HW,ALSA]
+        snd-korg1212=   [HW,ALSA]
+        snd-maestro3=   [HW,ALSA]
+        snd-mpu401=     [HW,ALSA]
+        snd-mtpav=      [HW,ALSA]
+        snd-nm256=      [HW,ALSA]
+        snd-opl3sa2=    [HW,ALSA]
+        snd-opti92x-ad1848=
+                        [HW,ALSA]
+        snd-opti92x-cs4231=
+                        [HW,ALSA]
+        snd-opti93x=    [HW,ALSA]
+        snd-pmac=       [HW,ALSA]
+        snd-rme32=      [HW,ALSA]
+        snd-rme96=      [HW,ALSA]
+        snd-rme9652=    [HW,ALSA]
+        snd-sb8=        [HW,ALSA]
+        snd-sb16=       [HW,ALSA]
+        snd-sbawe=      [HW,ALSA]
+        snd-serial=     [HW,ALSA]
+        snd-sgalaxy=    [HW,ALSA]
+        snd-sonicvibes= [HW,ALSA]
+        snd-sun-amd7930=
+                        [HW,ALSA]
+        snd-sun-cs4231= [HW,ALSA]
+        snd-trident=    [HW,ALSA]
+        snd-usb-audio=  [HW,ALSA,USB]
+        snd-via82xx=    [HW,ALSA]
+        snd-virmidi=    [HW,ALSA]
+        snd-wavefront=  [HW,ALSA]
+        snd-ymfpci=     [HW,ALSA]
diff --git a/Documentation/sound/alsa/soc/DAI.txt b/Documentation/sound/alsa/soc/DAI.txt
index 0ebd7ea9706c..c9679264c559 100644
--- a/Documentation/sound/alsa/soc/DAI.txt
+++ b/Documentation/sound/alsa/soc/DAI.txt
@@ -13,7 +13,7 @@ frame (FRAME) (usually 48kHz) is always driven by the controller. Each AC97
 frame is 21uS long and is divided into 13 time slots.
 The AC97 specification can be found at :-
-http://www.intel.com/design/chipsets/audio/ac97_r23.pdf
+http://www.intel.com/p/en_US/business/design
 I2S
diff --git a/Documentation/sound/alsa/soc/codec.txt b/Documentation/sound/alsa/soc/codec.txt
index 1e95342ed72e..37ba3a72cb76 100644
--- a/Documentation/sound/alsa/soc/codec.txt
+++ b/Documentation/sound/alsa/soc/codec.txt
@@ -143,7 +143,7 @@ struct snd_soc_ops {
 };
 Please refer to the ALSA driver PCM documentation for details.
-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c436.htm
+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/
 5 - DAPM description.
diff --git a/Documentation/sound/alsa/soc/platform.txt b/Documentation/sound/alsa/soc/platform.txt
index b681d17fc388..06d835987c6a 100644
--- a/Documentation/sound/alsa/soc/platform.txt
+++ b/Documentation/sound/alsa/soc/platform.txt
@@ -39,7 +39,7 @@ struct snd_soc_platform {
 };
 Please refer to the ALSA driver documentation for details of audio DMA.
-http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c436.htm
+http://www.alsa-project.org/~iwai/writing-an-alsa-driver/
 An example DMA driver is soc/pxa/pxa2xx-pcm.c
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS
index fd42b05b2f55..c615debbf08d 100644
--- a/Documentation/sound/oss/README.OSS
+++ b/Documentation/sound/oss/README.OSS
@@ -36,7 +36,7 @@ with OSS API.
 Packages "snd-util-3.8.tar.gz" and "snd-data-0.1.tar.Z"
 contain useful utilities to be used with this driver.
-See http://www.opensound.com/ossfree/getting.html for
+See http://www.opensound.com/ossfree/ for
 download instructions.
 If you are looking for the installation instructions, please
@@ -1438,7 +1438,7 @@ of this driver (see http://www.4Front-tech.com/oss.html for more info).
 There are some common audio chipsets that are not supported yet. For example
 Sierra Aria and IBM Mwave. It's possible that these architectures
 get some support in future but I can't make any promises. Just look
-at the home page (http://www.opensound.com/ossfree/new_cards.html)
+at the home page (http://www.opensound.com/ossfree/)
 for latest info.
 Information about unsupported sound cards and chipsets is welcome as well
@@ -1449,7 +1449,6 @@ If you have any corrections and/or comments, please contact me.
 Hannu Savolainen
 hannu@opensound.com
-Personal home page:        http://www.compusonic.fi/~hannu
 home page of OSS/Free: http://www.opensound.com/ossfree
 home page of commercial OSS
diff --git a/Documentation/sound/oss/oss-parameters.txt b/Documentation/sound/oss/oss-parameters.txt
new file mode 100644
index 000000000000..3ab391e7c295
--- /dev/null
+++ b/Documentation/sound/oss/oss-parameters.txt
@@ -0,0 +1,51 @@
+                          OSS Kernel Parameters
+                          ~~~~~~~~~~~~~~~~~~~~~
+See Documentation/kernel-parameters.txt for general information on
+specifying module parameters.
+This document may not be entirely up to date and comprehensive. The command
+"modinfo -p ${modulename}" shows a current list of all parameters of a loadable
+module. Loadable modules, after being loaded into the running kernel, also
+reveal their parameters in /sys/module/${modulename}/parameters/. Some of these
+parameters may be changed at runtime by the command
+"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".
+        ad1848=         [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<dma2>,<type>
+        aedsp16=        [HW,OSS] Audio Excel DSP 16
+                        Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>
+                        See also header of sound/oss/aedsp16.c.
+        dmasound=       [HW,OSS] Sound subsystem buffers
+        mpu401=         [HW,OSS]
+                        Format: <io>,<irq>
+        opl3=           [HW,OSS]
+                        Format: <io>
+        pas2=           [HW,OSS] Format:
+                        <io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
+        pss=            [HW,OSS] Personal Sound System (ECHO ESC614)
+                        Format:
+                        <io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>
+        sscape=         [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>
+        trix=           [HW,OSS] MediaTrix AudioTrix Pro
+                        Format:
+                        <io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>
+        uart401=        [HW,OSS]
+                        Format: <io>,<irq>
+        uart6850=       [HW,OSS]
+                        Format: <io>,<irq>
+        waveartist=     [HW,OSS]
+                        Format: <io>,<irq>,<dma>,<dma2>
diff --git a/Documentation/sparse.txt b/Documentation/sparse.txt
index 9b659c79a547..4909d4116356 100644
--- a/Documentation/sparse.txt
+++ b/Documentation/sparse.txt
@@ -1,5 +1,5 @@
 Copyright 2004 Linus Torvalds
-Copyright 2004 Pavel Machek <pavel@suse.cz>
+Copyright 2004 Pavel Machek <pavel@ucw.cz>
 Copyright 2006 Bob Copeland <me@bobcopeland.com>
 Using sparse for typechecking
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 5fdbb612aeb8..b606c2c4dd37 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -196,7 +196,7 @@ controlled by this knob are discussed in Documentation/laptops/laptop-mode.txt.
 legacy_va_layout
-If non-zero, this sysctl disables the new 32-bit mmap mmap layout - the kernel
+If non-zero, this sysctl disables the new 32-bit mmap layout - the kernel
 will use the legacy (2.4) layout for all processes.
 ==============================================================
@@ -511,7 +511,7 @@ information may not be desired.
 If this is set to non-zero, this information is shown whenever the
 OOM killer actually kills a memory-hogging task.
-The default value is 0.
+The default value is 1 (enabled).
 ==============================================================
diff --git a/Documentation/telephony/ixj.txt b/Documentation/telephony/ixj.txt
index 44d124005bad..4fb314d51702 100644
--- a/Documentation/telephony/ixj.txt
+++ b/Documentation/telephony/ixj.txt
@@ -108,14 +108,9 @@ applications.
 1.4  Where to get things
-You can download the latest versions of the driver from:
+Info on latest versions of the driver are here:
-http://www.quicknet.net/develop.htm
-You can download the latest version of this document from:
-http://www.quicknet.net/develop.htm
+http://web.archive.org/web/*/http://www.quicknet.net/develop.htm
 1.5  Mailing List
diff --git a/Documentation/timers/timers-howto.txt b/Documentation/timers/timers-howto.txt
new file mode 100644
index 000000000000..c9ef29d2ede3
--- /dev/null
+++ b/Documentation/timers/timers-howto.txt
@@ -0,0 +1,105 @@
+delays - Information on the various kernel delay / sleep mechanisms
+-------------------------------------------------------------------
+This document seeks to answer the common question: "What is the
+RightWay (TM) to insert a delay?"
+This question is most often faced by driver writers who have to
+deal with hardware delays and who may not be the most intimately
+familiar with the inner workings of the Linux Kernel.
+Inserting Delays
+----------------
+The first, and most important, question you need to ask is "Is my
+code in an atomic context?"  This should be followed closely by "Does
+it really need to delay in atomic context?" If so...
+ATOMIC CONTEXT:
+        You must use the *delay family of functions. These
+        functions use the jiffie estimation of clock speed
+        and will busy wait for enough loop cycles to achieve
+        the desired delay:
+        ndelay(unsigned long nsecs)
+        udelay(unsigned long usecs)
+        mdelay(unsgined long msecs)
+        udelay is the generally preferred API; ndelay-level
+        precision may not actually exist on many non-PC devices.
+        mdelay is macro wrapper around udelay, to account for
+        possible overflow when passing large arguments to udelay.
+        In general, use of mdelay is discouraged and code should
+        be refactored to allow for the use of msleep.
+NON-ATOMIC CONTEXT:
+        You should use the *sleep[_range] family of functions.
+        There are a few more options here, while any of them may
+        work correctly, using the "right" sleep function will
+        help the scheduler, power management, and just make your
+        driver better :)
+        -- Backed by busy-wait loop:
+                udelay(unsigned long usecs)
+        -- Backed by hrtimers:
+                usleep_range(unsigned long min, unsigned long max)
+        -- Backed by jiffies / legacy_timers
+                msleep(unsigned long msecs)
+                msleep_interruptible(unsigned long msecs)
+        Unlike the *delay family, the underlying mechanism
+        driving each of these calls varies, thus there are
+        quirks you should be aware of.
+        SLEEPING FOR "A FEW" USECS ( < ~10us? ):
+                * Use udelay
+                - Why not usleep?
+                        On slower systems, (embedded, OR perhaps a speed-
+                        stepped PC!) the overhead of setting up the hrtimers
+                        for usleep *may* not be worth it. Such an evaluation
+                        will obviously depend on your specific situation, but
+                        it is something to be aware of.
+        SLEEPING FOR ~USECS OR SMALL MSECS ( 10us - 20ms):
+                * Use usleep_range
+                - Why not msleep for (1ms - 20ms)?
+                        Explained originally here:
+                                http://lkml.org/lkml/2007/8/3/250
+                        msleep(1~20) may not do what the caller intends, and
+                        will often sleep longer (~20 ms actual sleep for any
+                        value given in the 1~20ms range). In many cases this
+                        is not the desired behavior.
+                - Why is there no "usleep" / What is a good range?
+                        Since usleep_range is built on top of hrtimers, the
+                        wakeup will be very precise (ish), thus a simple
+                        usleep function would likely introduce a large number
+                        of undesired interrupts.
+                        With the introduction of a range, the scheduler is
+                        free to coalesce your wakeup with any other wakeup
+                        that may have happened for other reasons, or at the
+                        worst case, fire an interrupt for your upper bound.
+                        The larger a range you supply, the greater a chance
+                        that you will not trigger an interrupt; this should
+                        be balanced with what is an acceptable upper bound on
+                        delay / performance for your specific code path. Exact
+                        tolerances here are very situation specific, thus it
+                        is left to the caller to determine a reasonable range.
+        SLEEPING FOR LARGER MSECS ( 10ms+ )
+                * Use msleep or possibly msleep_interruptible
+                - What's the difference?
+                        msleep sets the current task to TASK_UNINTERRUPTIBLE
+                        whereas msleep_interruptible sets the current task to
+                        TASK_INTERRUPTIBLE before scheduling the sleep. In
+                        short, the difference is whether the sleep can be ended
+                        early by a signal. In general, just use msleep unless
+                        you know you have a need for the interruptible variant.
diff --git a/Documentation/tomoyo.txt b/Documentation/tomoyo.txt
index b3a232cae7f8..200a2d37cbc8 100644
--- a/Documentation/tomoyo.txt
+++ b/Documentation/tomoyo.txt
@@ -3,8 +3,8 @@
 TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
 LiveCD-based tutorials are available at
-http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/ubuntu8.04-live/
+http://tomoyo.sourceforge.jp/1.7/1st-step/ubuntu10.04-live/
-http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/centos5-live/ .
+http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ .
 Though these tutorials use non-LSM version of TOMOYO, they are useful for you
 to know what TOMOYO is.
@@ -13,12 +13,12 @@ to know what TOMOYO is.
 Build the kernel with CONFIG_SECURITY_TOMOYO=y and pass "security=tomoyo" on
 kernel's command line.
-Please see http://tomoyo.sourceforge.jp/en/2.2.x/ for details.
+Please see http://tomoyo.sourceforge.jp/2.3/ for details.
 --- Where is documentation? ---
 User <-> Kernel interface documentation is available at
-http://tomoyo.sourceforge.jp/en/2.2.x/policy-reference.html .
+http://tomoyo.sourceforge.jp/2.3/policy-reference.html .
 Materials we prepared for seminars and symposiums are available at
 http://sourceforge.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
@@ -50,6 +50,6 @@ multiple LSM modules at the same time. We feel sorry that you have to give up
 SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
 We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
-version of TOMOYO, available at http://tomoyo.sourceforge.jp/en/1.6.x/ .
+version of TOMOYO, available at http://tomoyo.sourceforge.jp/1.7/ .
 LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
 to port non-LSM version's functionalities to LSM versions.
diff --git a/Documentation/trace/ftrace-design.txt b/Documentation/trace/ftrace-design.txt
index f1f81afee8a0..dc52bd442c92 100644
--- a/Documentation/trace/ftrace-design.txt
+++ b/Documentation/trace/ftrace-design.txt
@@ -13,6 +13,9 @@ Note that this focuses on architecture implementation details only.  If you
 want more explanation of a feature in terms of common code, review the common
 ftrace.txt file.
+Ideally, everyone who wishes to retain performance while supporting tracing in
+their kernel should make it all the way to dynamic ftrace support.
 Prerequisites
 -------------
@@ -215,7 +218,7 @@ An arch may pass in a unique value (frame pointer) to both the entering and
 exiting of a function.  On exit, the value is compared and if it does not
 match, then it will panic the kernel.  This is largely a sanity check for bad
 code generation with gcc.  If gcc for your port sanely updates the frame
-pointer under different opitmization levels, then ignore this option.
+pointer under different optimization levels, then ignore this option.
 However, adding support for it isn't terribly difficult.  In your assembly code
 that calls prepare_ftrace_return(), pass the frame pointer as the 3rd argument.
@@ -234,7 +237,7 @@ If you can't trace NMI functions, then skip this option.
 HAVE_SYSCALL_TRACEPOINTS
---------------------
+------------------------
 You need very few things to get the syscalls tracing in an arch.
@@ -250,12 +253,152 @@ You need very few things to get the syscalls tracing in an arch.
 HAVE_FTRACE_MCOUNT_RECORD
 -------------------------
-See scripts/recordmcount.pl for more info.
+See scripts/recordmcount.pl for more info.  Just fill in the arch-specific
+details for how to locate the addresses of mcount call sites via objdump.
+This option doesn't make much sense without also implementing dynamic ftrace.
+HAVE_DYNAMIC_FTRACE
+-------------------
+You will first need HAVE_FTRACE_MCOUNT_RECORD and HAVE_FUNCTION_TRACER, so
+scroll your reader back up if you got over eager.
+Once those are out of the way, you will need to implement:
+        - asm/ftrace.h:
+                - MCOUNT_ADDR
+                - ftrace_call_adjust()
+                - struct dyn_arch_ftrace{}
+        - asm code:
+                - mcount() (new stub)
+                - ftrace_caller()
+                - ftrace_call()
+                - ftrace_stub()
+        - C code:
+                - ftrace_dyn_arch_init()
+                - ftrace_make_nop()
+                - ftrace_make_call()
+                - ftrace_update_ftrace_func()
+First you will need to fill out some arch details in your asm/ftrace.h.
+Define MCOUNT_ADDR as the address of your mcount symbol similar to:
+        #define MCOUNT_ADDR ((unsigned long)mcount)
+Since no one else will have a decl for that function, you will need to:
+        extern void mcount(void);
+You will also need the helper function ftrace_call_adjust().  Most people
+will be able to stub it out like so:
+        static inline unsigned long ftrace_call_adjust(unsigned long addr)
+        {
+                return addr;
+        }
 <details to be filled>
+Lastly you will need the custom dyn_arch_ftrace structure.  If you need
+some extra state when runtime patching arbitrary call sites, this is the
+place.  For now though, create an empty struct:
+        struct dyn_arch_ftrace {
+                /* No extra data needed */
+        };
+With the header out of the way, we can fill out the assembly code.  While we
+did already create a mcount() function earlier, dynamic ftrace only wants a
+stub function.  This is because the mcount() will only be used during boot
+and then all references to it will be patched out never to return.  Instead,
+the guts of the old mcount() will be used to create a new ftrace_caller()
+function.  Because the two are hard to merge, it will most likely be a lot
+easier to have two separate definitions split up by #ifdefs.  Same goes for
+the ftrace_stub() as that will now be inlined in ftrace_caller().
+Before we get confused anymore, let's check out some pseudo code so you can
+implement your own stuff in assembly:
-HAVE_DYNAMIC_FTRACE
+void mcount(void)
---------------------
+{
+        return;
+}
+void ftrace_caller(void)
+{
+        /* implement HAVE_FUNCTION_TRACE_MCOUNT_TEST if you desire */
+        /* save all state needed by the ABI (see paragraph above) */
+        unsigned long frompc = ...;
+        unsigned long selfpc = <return address> - MCOUNT_INSN_SIZE;
+ftrace_call:
+        ftrace_stub(frompc, selfpc);
+        /* restore all state needed by the ABI */
+ftrace_stub:
+        return;
+}
+This might look a little odd at first, but keep in mind that we will be runtime
+patching multiple things.  First, only functions that we actually want to trace
+will be patched to call ftrace_caller().  Second, since we only have one tracer
+active at a time, we will patch the ftrace_caller() function itself to call the
+specific tracer in question.  That is the point of the ftrace_call label.
+With that in mind, let's move on to the C code that will actually be doing the
+runtime patching.  You'll need a little knowledge of your arch's opcodes in
+order to make it through the next section.
+Every arch has an init callback function.  If you need to do something early on
+to initialize some state, this is the time to do that.  Otherwise, this simple
+function below should be sufficient for most people:
+int __init ftrace_dyn_arch_init(void *data)
+{
+        /* return value is done indirectly via data */
+        *(unsigned long *)data = 0;
+        return 0;
+}
+There are two functions that are used to do runtime patching of arbitrary
+functions.  The first is used to turn the mcount call site into a nop (which
+is what helps us retain runtime performance when not tracing).  The second is
+used to turn the mcount call site into a call to an arbitrary location (but
+typically that is ftracer_caller()).  See the general function definition in
+linux/ftrace.h for the functions:
+        ftrace_make_nop()
+        ftrace_make_call()
+The rec->ip value is the address of the mcount call site that was collected
+by the scripts/recordmcount.pl during build time.
+The last function is used to do runtime patching of the active tracer.  This
+will be modifying the assembly code at the location of the ftrace_call symbol
+inside of the ftrace_caller() function.  So you should have sufficient padding
+at that location to support the new function calls you'll be inserting.  Some
+people will be using a "call" type instruction while others will be using a
+"branch" type instruction.  Specifically, the function is:
+        ftrace_update_ftrace_func()
+HAVE_DYNAMIC_FTRACE + HAVE_FUNCTION_GRAPH_TRACER
+------------------------------------------------
+The function grapher needs a few tweaks in order to work with dynamic ftrace.
+Basically, you will need to:
+        - update:
+                - ftrace_caller()
+                - ftrace_graph_call()
+                - ftrace_graph_caller()
+        - implement:
+                - ftrace_enable_ftrace_graph_caller()
+                - ftrace_disable_ftrace_graph_caller()
 <details to be filled>
+Quick notes:
+        - add a nop stub after the ftrace_call location named ftrace_graph_call;
+          stub needs to be large enough to support a call to ftrace_graph_caller()
+        - update ftrace_graph_caller() to work with being called by the new
+          ftrace_caller() since some semantics may have changed
+        - ftrace_enable_ftrace_graph_caller() will runtime patch the
+          ftrace_graph_call location with a call to ftrace_graph_caller()
+        - ftrace_disable_ftrace_graph_caller() will runtime patch the
+          ftrace_graph_call location with nops
diff --git a/Documentation/trace/kmemtrace.txt b/Documentation/trace/kmemtrace.txt
deleted file mode 100644
index 6308735e58ca..000000000000
--- a/Documentation/trace/kmemtrace.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-                        kmemtrace - Kernel Memory Tracer
-                          by Eduard - Gabriel Munteanu
-                             <eduard.munteanu@linux360.ro>
-I. Introduction
-===============
-kmemtrace helps kernel developers figure out two things:
-1) how different allocators (SLAB, SLUB etc.) perform
-2) how kernel code allocates memory and how much
-To do this, we trace every allocation and export information to the userspace
-through the relay interface. We export things such as the number of requested
-bytes, the number of bytes actually allocated (i.e. including internal
-fragmentation), whether this is a slab allocation or a plain kmalloc() and so
-on.
-The actual analysis is performed by a userspace tool (see section III for
-details on where to get it from). It logs the data exported by the kernel,
-processes it and (as of writing this) can provide the following information:
- the total amount of memory allocated and fragmentation per call-site
- the amount of memory allocated and fragmentation per allocation
- total memory allocated and fragmentation in the collected dataset
- number of cross-CPU allocation and frees (makes sense in NUMA environments)
-Moreover, it can potentially find inconsistent and erroneous behavior in
-kernel code, such as using slab free functions on kmalloc'ed memory or
-allocating less memory than requested (but not truly failed allocations).
-kmemtrace also makes provisions for tracing on some arch and analysing the
-data on another.
-II. Design and goals
-====================
-kmemtrace was designed to handle rather large amounts of data. Thus, it uses
-the relay interface to export whatever is logged to userspace, which then
-stores it. Analysis and reporting is done asynchronously, that is, after the
-data is collected and stored. By design, it allows one to log and analyse
-on different machines and different arches.
-As of writing this, the ABI is not considered stable, though it might not
-change much. However, no guarantees are made about compatibility yet. When
-deemed stable, the ABI should still allow easy extension while maintaining
-backward compatibility. This is described further in Documentation/ABI.
-Summary of design goals:
-        - allow logging and analysis to be done across different machines
-        - be fast and anticipate usage in high-load environments (*)
-        - be reasonably extensible
-        - make it possible for GNU/Linux distributions to have kmemtrace
-        included in their repositories
-(*) - one of the reasons Pekka Enberg's original userspace data analysis
-    tool's code was rewritten from Perl to C (although this is more than a
-    simple conversion)
-III. Quick usage guide
-======================
-1) Get a kernel that supports kmemtrace and build it accordingly (i.e. enable
-CONFIG_KMEMTRACE).
-2) Get the userspace tool and build it:
-$ git clone git://repo.or.cz/kmemtrace-user.git         # current repository
-$ cd kmemtrace-user/
-$ ./autogen.sh
-$ ./configure
-$ make
-3) Boot the kmemtrace-enabled kernel if you haven't, preferably in the
-'single' runlevel (so that relay buffers don't fill up easily), and run
-kmemtrace:
-# '$' does not mean user, but root here.
-$ mount -t debugfs none /sys/kernel/debug
-$ mount -t proc none /proc
-$ cd path/to/kmemtrace-user/
-$ ./kmemtraced
-Wait a bit, then stop it with CTRL+C.
-$ cat /sys/kernel/debug/kmemtrace/total_overruns        # Check if we didn't
-                                                        # overrun, should
-                                                        # be zero.
-$ (Optionally) [Run kmemtrace_check separately on each cpu[0-9]*.out file to
-                check its correctness]
-$ ./kmemtrace-report
-Now you should have a nice and short summary of how the allocator performs.
-IV. FAQ and known issues
-========================
-Q: 'cat /sys/kernel/debug/kmemtrace/total_overruns' is non-zero, how do I fix
-this? Should I worry?
-A: If it's non-zero, this affects kmemtrace's accuracy, depending on how
-large the number is. You can fix it by supplying a higher
-'kmemtrace.subbufs=N' kernel parameter.
---
-Q: kmemtrace_check reports errors, how do I fix this? Should I worry?
-A: This is a bug and should be reported. It can occur for a variety of
-reasons:
-        - possible bugs in relay code
-        - possible misuse of relay by kmemtrace
-        - timestamps being collected unorderly
-Or you may fix it yourself and send us a patch.
---
-Q: kmemtrace_report shows many errors, how do I fix this? Should I worry?
-A: This is a known issue and I'm working on it. These might be true errors
-in kernel code, which may have inconsistent behavior (e.g. allocating memory
-with kmem_cache_alloc() and freeing it with kfree()). Pekka Enberg pointed
-out this behavior may work with SLAB, but may fail with other allocators.
-It may also be due to lack of tracing in some unusual allocator functions.
-We don't want bug reports regarding this issue yet.
---
-V. See also
-===========
-Documentation/kernel-parameters.txt
-Documentation/ABI/testing/debugfs-kmemtrace
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt
index ec94748ae65b..5f77d94598dd 100644
--- a/Documentation/trace/kprobetrace.txt
+++ b/Documentation/trace/kprobetrace.txt
@@ -42,7 +42,7 @@ Synopsis of kprobe_events
  +|-offs(FETCHARG) : Fetch memory at FETCHARG +|- offs address.(**)
  NAME=FETCHARG : Set NAME as the argument name of FETCHARG.
  FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types
-                  (u8/u16/u32/u64/s8/s16/s32/s64) are supported.
+                  (u8/u16/u32/u64/s8/s16/s32/s64) and string are supported.
  (*) only for return probe.
  (**) this is useful for fetching a field of data structures.
diff --git a/Documentation/trace/postprocess/trace-vmscan-postprocess.pl b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
new file mode 100644
index 000000000000..1b55146d1c8d
--- /dev/null
+++ b/Documentation/trace/postprocess/trace-vmscan-postprocess.pl
@@ -0,0 +1,686 @@
+#!/usr/bin/perl
+# This is a POC for reading the text representation of trace output related to
+# page reclaim. It makes an attempt to extract some high-level information on
+# what is going on. The accuracy of the parser may vary
+#
+# Example usage: trace-vmscan-postprocess.pl < /sys/kernel/debug/tracing/trace_pipe
+# other options
+#   --read-procstat     If the trace lacks process info, get it from /proc
+#   --ignore-pid        Aggregate processes of the same name together
+#
+# Copyright (c) IBM Corporation 2009
+# Author: Mel Gorman <mel@csn.ul.ie>
+use strict;
+use Getopt::Long;
+# Tracepoint events
+use constant MM_VMSCAN_DIRECT_RECLAIM_BEGIN     => 1;
+use constant MM_VMSCAN_DIRECT_RECLAIM_END       => 2;
+use constant MM_VMSCAN_KSWAPD_WAKE              => 3;
+use constant MM_VMSCAN_KSWAPD_SLEEP             => 4;
+use constant MM_VMSCAN_LRU_SHRINK_ACTIVE        => 5;
+use constant MM_VMSCAN_LRU_SHRINK_INACTIVE      => 6;
+use constant MM_VMSCAN_LRU_ISOLATE              => 7;
+use constant MM_VMSCAN_WRITEPAGE_FILE_SYNC      => 8;
+use constant MM_VMSCAN_WRITEPAGE_ANON_SYNC      => 9;
+use constant MM_VMSCAN_WRITEPAGE_FILE_ASYNC     => 10;
+use constant MM_VMSCAN_WRITEPAGE_ANON_ASYNC     => 11;
+use constant MM_VMSCAN_WRITEPAGE_ASYNC          => 12;
+use constant EVENT_UNKNOWN                      => 13;
+# Per-order events
+use constant MM_VMSCAN_DIRECT_RECLAIM_BEGIN_PERORDER => 11;
+use constant MM_VMSCAN_WAKEUP_KSWAPD_PERORDER   => 12;
+use constant MM_VMSCAN_KSWAPD_WAKE_PERORDER     => 13;
+use constant HIGH_KSWAPD_REWAKEUP_PERORDER      => 14;
+# Constants used to track state
+use constant STATE_DIRECT_BEGIN                 => 15;
+use constant STATE_DIRECT_ORDER                 => 16;
+use constant STATE_KSWAPD_BEGIN                 => 17;
+use constant STATE_KSWAPD_ORDER                 => 18;
+# High-level events extrapolated from tracepoints
+use constant HIGH_DIRECT_RECLAIM_LATENCY        => 19;
+use constant HIGH_KSWAPD_LATENCY                => 20;
+use constant HIGH_KSWAPD_REWAKEUP               => 21;
+use constant HIGH_NR_SCANNED                    => 22;
+use constant HIGH_NR_TAKEN                      => 23;
+use constant HIGH_NR_RECLAIM                    => 24;
+use constant HIGH_NR_CONTIG_DIRTY               => 25;
+my %perprocesspid;
+my %perprocess;
+my %last_procmap;
+my $opt_ignorepid;
+my $opt_read_procstat;
+my $total_wakeup_kswapd;
+my ($total_direct_reclaim, $total_direct_nr_scanned);
+my ($total_direct_latency, $total_kswapd_latency);
+my ($total_direct_writepage_file_sync, $total_direct_writepage_file_async);
+my ($total_direct_writepage_anon_sync, $total_direct_writepage_anon_async);
+my ($total_kswapd_nr_scanned, $total_kswapd_wake);
+my ($total_kswapd_writepage_file_sync, $total_kswapd_writepage_file_async);
+my ($total_kswapd_writepage_anon_sync, $total_kswapd_writepage_anon_async);
+# Catch sigint and exit on request
+my $sigint_report = 0;
+my $sigint_exit = 0;
+my $sigint_pending = 0;
+my $sigint_received = 0;
+sub sigint_handler {
+        my $current_time = time;
+        if ($current_time - 2 > $sigint_received) {
+                print "SIGINT received, report pending. Hit ctrl-c again to exit\n";
+                $sigint_report = 1;
+        } else {
+                if (!$sigint_exit) {
+                        print "Second SIGINT received quickly, exiting\n";
+                }
+                $sigint_exit++;
+        }
+        if ($sigint_exit > 3) {
+                print "Many SIGINTs received, exiting now without report\n";
+                exit;
+        }
+        $sigint_received = $current_time;
+        $sigint_pending = 1;
+}
+$SIG{INT} = "sigint_handler";
+# Parse command line options
+GetOptions(
+        'ignore-pid'     =>     \$opt_ignorepid,
+        'read-procstat'  =>     \$opt_read_procstat,
+);
+# Defaults for dynamically discovered regex's
+my $regex_direct_begin_default = 'order=([0-9]*) may_writepage=([0-9]*) gfp_flags=([A-Z_|]*)';
+my $regex_direct_end_default = 'nr_reclaimed=([0-9]*)';
+my $regex_kswapd_wake_default = 'nid=([0-9]*) order=([0-9]*)';
+my $regex_kswapd_sleep_default = 'nid=([0-9]*)';
+my $regex_wakeup_kswapd_default = 'nid=([0-9]*) zid=([0-9]*) order=([0-9]*)';
+my $regex_lru_isolate_default = 'isolate_mode=([0-9]*) order=([0-9]*) nr_requested=([0-9]*) nr_scanned=([0-9]*) nr_taken=([0-9]*) contig_taken=([0-9]*) contig_dirty=([0-9]*) contig_failed=([0-9]*)';
+my $regex_lru_shrink_inactive_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_reclaimed=([0-9]*) priority=([0-9]*)';
+my $regex_lru_shrink_active_default = 'lru=([A-Z_]*) nr_scanned=([0-9]*) nr_rotated=([0-9]*) priority=([0-9]*)';
+my $regex_writepage_default = 'page=([0-9a-f]*) pfn=([0-9]*) flags=([A-Z_|]*)';
+# Dyanically discovered regex
+my $regex_direct_begin;
+my $regex_direct_end;
+my $regex_kswapd_wake;
+my $regex_kswapd_sleep;
+my $regex_wakeup_kswapd;
+my $regex_lru_isolate;
+my $regex_lru_shrink_inactive;
+my $regex_lru_shrink_active;
+my $regex_writepage;
+# Static regex used. Specified like this for readability and for use with /o
+#                      (process_pid)     (cpus      )   ( time  )   (tpoint    ) (details)
+my $regex_traceevent = '\s*([a-zA-Z0-9-]*)\s*(\[[0-9]*\])\s*([0-9.]*):\s*([a-zA-Z_]*):\s*(.*)';
+my $regex_statname = '[-0-9]*\s\((.*)\).*';
+my $regex_statppid = '[-0-9]*\s\(.*\)\s[A-Za-z]\s([0-9]*).*';
+sub generate_traceevent_regex {
+        my $event = shift;
+        my $default = shift;
+        my $regex;
+        # Read the event format or use the default
+        if (!open (FORMAT, "/sys/kernel/debug/tracing/events/$event/format")) {
+                print("WARNING: Event $event format string not found\n");
+                return $default;
+        } else {
+                my $line;
+                while (!eof(FORMAT)) {
+                        $line = <FORMAT>;
+                        $line =~ s/, REC->.*//;
+                        if ($line =~ /^print fmt:\s"(.*)".*/) {
+                                $regex = $1;
+                                $regex =~ s/%s/\([0-9a-zA-Z|_]*\)/g;
+                                $regex =~ s/%p/\([0-9a-f]*\)/g;
+                                $regex =~ s/%d/\([-0-9]*\)/g;
+                                $regex =~ s/%ld/\([-0-9]*\)/g;
+                                $regex =~ s/%lu/\([0-9]*\)/g;
+                        }
+                }
+        }
+        # Can't handle the print_flags stuff but in the context of this
+        # script, it really doesn't matter
+        $regex =~ s/\(REC.*\) \? __print_flags.*//;
+        # Verify fields are in the right order
+        my $tuple;
+        foreach $tuple (split /\s/, $regex) {
+                my ($key, $value) = split(/=/, $tuple);
+                my $expected = shift;
+                if ($key ne $expected) {
+                        print("WARNING: Format not as expected for event $event '$key' != '$expected'\n");
+                        $regex =~ s/$key=\((.*)\)/$key=$1/;
+                }
+        }
+        if (defined shift) {
+                die("Fewer fields than expected in format");
+        }
+        return $regex;
+}
+$regex_direct_begin = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_direct_reclaim_begin",
+                        $regex_direct_begin_default,
+                        "order", "may_writepage",
+                        "gfp_flags");
+$regex_direct_end = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_direct_reclaim_end",
+                        $regex_direct_end_default,
+                        "nr_reclaimed");
+$regex_kswapd_wake = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_kswapd_wake",
+                        $regex_kswapd_wake_default,
+                        "nid", "order");
+$regex_kswapd_sleep = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_kswapd_sleep",
+                        $regex_kswapd_sleep_default,
+                        "nid");
+$regex_wakeup_kswapd = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_wakeup_kswapd",
+                        $regex_wakeup_kswapd_default,
+                        "nid", "zid", "order");
+$regex_lru_isolate = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_lru_isolate",
+                        $regex_lru_isolate_default,
+                        "isolate_mode", "order",
+                        "nr_requested", "nr_scanned", "nr_taken",
+                        "contig_taken", "contig_dirty", "contig_failed");
+$regex_lru_shrink_inactive = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_lru_shrink_inactive",
+                        $regex_lru_shrink_inactive_default,
+                        "nid", "zid",
+                        "lru",
+                        "nr_scanned", "nr_reclaimed", "priority");
+$regex_lru_shrink_active = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_lru_shrink_active",
+                        $regex_lru_shrink_active_default,
+                        "nid", "zid",
+                        "lru",
+                        "nr_scanned", "nr_rotated", "priority");
+$regex_writepage = generate_traceevent_regex(
+                        "vmscan/mm_vmscan_writepage",
+                        $regex_writepage_default,
+                        "page", "pfn", "flags");
+sub read_statline($) {
+        my $pid = $_[0];
+        my $statline;
+        if (open(STAT, "/proc/$pid/stat")) {
+                $statline = <STAT>;
+                close(STAT);
+        }
+        if ($statline eq '') {
+                $statline = "-1 (UNKNOWN_PROCESS_NAME) R 0";
+        }
+        return $statline;
+}
+sub guess_process_pid($$) {
+        my $pid = $_[0];
+        my $statline = $_[1];
+        if ($pid == 0) {
+                return "swapper-0";
+        }
+        if ($statline !~ /$regex_statname/o) {
+                die("Failed to math stat line for process name :: $statline");
+        }
+        return "$1-$pid";
+}
+# Convert sec.usec timestamp format
+sub timestamp_to_ms($) {
+        my $timestamp = $_[0];
+        my ($sec, $usec) = split (/\./, $timestamp);
+        return ($sec * 1000) + ($usec / 1000);
+}
+sub process_events {
+        my $traceevent;
+        my $process_pid;
+        my $cpus;
+        my $timestamp;
+        my $tracepoint;
+        my $details;
+        my $statline;
+        # Read each line of the event log
+EVENT_PROCESS:
+        while ($traceevent = <STDIN>) {
+                if ($traceevent =~ /$regex_traceevent/o) {
+                        $process_pid = $1;
+                        $timestamp = $3;
+                        $tracepoint = $4;
+                        $process_pid =~ /(.*)-([0-9]*)$/;
+                        my $process = $1;
+                        my $pid = $2;
+                        if ($process eq "") {
+                                $process = $last_procmap{$pid};
+                                $process_pid = "$process-$pid";
+                        }
+                        $last_procmap{$pid} = $process;
+                        if ($opt_read_procstat) {
+                                $statline = read_statline($pid);
+                                if ($opt_read_procstat && $process eq '') {
+                                        $process_pid = guess_process_pid($pid, $statline);
+                                }
+                        }
+                } else {
+                        next;
+                }
+                # Perl Switch() sucks majorly
+                if ($tracepoint eq "mm_vmscan_direct_reclaim_begin") {
+                        $timestamp = timestamp_to_ms($timestamp);
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN}++;
+                        $perprocesspid{$process_pid}->{STATE_DIRECT_BEGIN} = $timestamp;
+                        $details = $5;
+                        if ($details !~ /$regex_direct_begin/o) {
+                                print "WARNING: Failed to parse mm_vmscan_direct_reclaim_begin as expected\n";
+                                print "         $details\n";
+                                print "         $regex_direct_begin\n";
+                                next;
+                        }
+                        my $order = $1;
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN_PERORDER}[$order]++;
+                        $perprocesspid{$process_pid}->{STATE_DIRECT_ORDER} = $order;
+                } elsif ($tracepoint eq "mm_vmscan_direct_reclaim_end") {
+                        # Count the event itself
+                        my $index = $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_END};
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_END}++;
+                        # Record how long direct reclaim took this time
+                        if (defined $perprocesspid{$process_pid}->{STATE_DIRECT_BEGIN}) {
+                                $timestamp = timestamp_to_ms($timestamp);
+                                my $order = $perprocesspid{$process_pid}->{STATE_DIRECT_ORDER};
+                                my $latency = ($timestamp - $perprocesspid{$process_pid}->{STATE_DIRECT_BEGIN});
+                                $perprocesspid{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index] = "$order-$latency";
+                        }
+                } elsif ($tracepoint eq "mm_vmscan_kswapd_wake") {
+                        $details = $5;
+                        if ($details !~ /$regex_kswapd_wake/o) {
+                                print "WARNING: Failed to parse mm_vmscan_kswapd_wake as expected\n";
+                                print "         $details\n";
+                                print "         $regex_kswapd_wake\n";
+                                next;
+                        }
+                        my $order = $2;
+                        $perprocesspid{$process_pid}->{STATE_KSWAPD_ORDER} = $order;
+                        if (!$perprocesspid{$process_pid}->{STATE_KSWAPD_BEGIN}) {
+                                $timestamp = timestamp_to_ms($timestamp);
+                                $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE}++;
+                                $perprocesspid{$process_pid}->{STATE_KSWAPD_BEGIN} = $timestamp;
+                                $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE_PERORDER}[$order]++;
+                        } else {
+                                $perprocesspid{$process_pid}->{HIGH_KSWAPD_REWAKEUP}++;
+                                $perprocesspid{$process_pid}->{HIGH_KSWAPD_REWAKEUP_PERORDER}[$order]++;
+                        }
+                } elsif ($tracepoint eq "mm_vmscan_kswapd_sleep") {
+                        # Count the event itself
+                        my $index = $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_SLEEP};
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_SLEEP}++;
+                        # Record how long kswapd was awake
+                        $timestamp = timestamp_to_ms($timestamp);
+                        my $order = $perprocesspid{$process_pid}->{STATE_KSWAPD_ORDER};
+                        my $latency = ($timestamp - $perprocesspid{$process_pid}->{STATE_KSWAPD_BEGIN});
+                        $perprocesspid{$process_pid}->{HIGH_KSWAPD_LATENCY}[$index] = "$order-$latency";
+                        $perprocesspid{$process_pid}->{STATE_KSWAPD_BEGIN} = 0;
+                } elsif ($tracepoint eq "mm_vmscan_wakeup_kswapd") {
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD}++;
+                        $details = $5;
+                        if ($details !~ /$regex_wakeup_kswapd/o) {
+                                print "WARNING: Failed to parse mm_vmscan_wakeup_kswapd as expected\n";
+                                print "         $details\n";
+                                print "         $regex_wakeup_kswapd\n";
+                                next;
+                        }
+                        my $order = $3;
+                        $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order]++;
+                } elsif ($tracepoint eq "mm_vmscan_lru_isolate") {
+                        $details = $5;
+                        if ($details !~ /$regex_lru_isolate/o) {
+                                print "WARNING: Failed to parse mm_vmscan_lru_isolate as expected\n";
+                                print "         $details\n";
+                                print "         $regex_lru_isolate/o\n";
+                                next;
+                        }
+                        my $nr_scanned = $4;
+                        my $nr_contig_dirty = $7;
+                        $perprocesspid{$process_pid}->{HIGH_NR_SCANNED} += $nr_scanned;
+                        $perprocesspid{$process_pid}->{HIGH_NR_CONTIG_DIRTY} += $nr_contig_dirty;
+                } elsif ($tracepoint eq "mm_vmscan_writepage") {
+                        $details = $5;
+                        if ($details !~ /$regex_writepage/o) {
+                                print "WARNING: Failed to parse mm_vmscan_writepage as expected\n";
+                                print "         $details\n";
+                                print "         $regex_writepage\n";
+                                next;
+                        }
+                        my $flags = $3;
+                        my $file = 0;
+                        my $sync_io = 0;
+                        if ($flags =~ /RECLAIM_WB_FILE/) {
+                                $file = 1;
+                        }
+                        if ($flags =~ /RECLAIM_WB_SYNC/) {
+                                $sync_io = 1;
+                        }
+                        if ($sync_io) {
+                                if ($file) {
+                                        $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC}++;
+                                } else {
+                                        $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC}++;
+                                }
+                        } else {
+                                if ($file) {
+                                        $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC}++;
+                                } else {
+                                        $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC}++;
+                                }
+                        }
+                } else {
+                        $perprocesspid{$process_pid}->{EVENT_UNKNOWN}++;
+                }
+                if ($sigint_pending) {
+                        last EVENT_PROCESS;
+                }
+        }
+}
+sub dump_stats {
+        my $hashref = shift;
+        my %stats = %$hashref;
+        # Dump per-process stats
+        my $process_pid;
+        my $max_strlen = 0;
+        # Get the maximum process name
+        foreach $process_pid (keys %perprocesspid) {
+                my $len = length($process_pid);
+                if ($len > $max_strlen) {
+                        $max_strlen = $len;
+                }
+        }
+        $max_strlen += 2;
+        # Work out latencies
+        printf("\n") if !$opt_ignorepid;
+        printf("Reclaim latencies expressed as order-latency_in_ms\n") if !$opt_ignorepid;
+        foreach $process_pid (keys %stats) {
+                if (!$stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[0] &&
+                                !$stats{$process_pid}->{HIGH_KSWAPD_LATENCY}[0]) {
+                        next;
+                }
+                printf "%-" . $max_strlen . "s ", $process_pid if !$opt_ignorepid;
+                my $index = 0;
+                while (defined $stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index] ||
+                        defined $stats{$process_pid}->{HIGH_KSWAPD_LATENCY}[$index]) {
+                        if ($stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index]) {
+                                printf("%s ", $stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index]) if !$opt_ignorepid;
+                                my ($dummy, $latency) = split(/-/, $stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index]);
+                                $total_direct_latency += $latency;
+                        } else {
+                                printf("%s ", $stats{$process_pid}->{HIGH_KSWAPD_LATENCY}[$index]) if !$opt_ignorepid;
+                                my ($dummy, $latency) = split(/-/, $stats{$process_pid}->{HIGH_KSWAPD_LATENCY}[$index]);
+                                $total_kswapd_latency += $latency;
+                        }
+                        $index++;
+                }
+                print "\n" if !$opt_ignorepid;
+        }
+        # Print out process activity
+        printf("\n");
+        printf("%-" . $max_strlen . "s %8s %10s   %8s   %8s %8s %8s %8s\n", "Process", "Direct",  "Wokeup", "Pages",   "Pages",   "Pages",     "Time");
+        printf("%-" . $max_strlen . "s %8s %10s   %8s   %8s %8s %8s %8s\n", "details", "Rclms",   "Kswapd", "Scanned", "Sync-IO", "ASync-IO",  "Stalled");
+        foreach $process_pid (keys %stats) {
+                if (!$stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN}) {
+                        next;
+                }
+                $total_direct_reclaim += $stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN};
+                $total_wakeup_kswapd += $stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};
+                $total_direct_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};
+                $total_direct_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
+                $total_direct_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
+                $total_direct_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
+                $total_direct_writepage_anon_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC};
+                my $index = 0;
+                my $this_reclaim_delay = 0;
+                while (defined $stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index]) {
+                         my ($dummy, $latency) = split(/-/, $stats{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$index]);
+                        $this_reclaim_delay += $latency;
+                        $index++;
+                }
+                printf("%-" . $max_strlen . "s %8d %10d   %8u   %8u %8u %8.3f",
+                        $process_pid,
+                        $stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN},
+                        $stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD},
+                        $stats{$process_pid}->{HIGH_NR_SCANNED},
+                        $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},
+                        $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC},
+                        $this_reclaim_delay / 1000);
+                if ($stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN}) {
+                        print "      ";
+                        for (my $order = 0; $order < 20; $order++) {
+                                my $count = $stats{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN_PERORDER}[$order];
+                                if ($count != 0) {
+                                        print "direct-$order=$count ";
+                                }
+                        }
+                }
+                if ($stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD}) {
+                        print "      ";
+                        for (my $order = 0; $order < 20; $order++) {
+                                my $count = $stats{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order];
+                                if ($count != 0) {
+                                        print "wakeup-$order=$count ";
+                                }
+                        }
+                }
+                if ($stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY}) {
+                        print "      ";
+                        my $count = $stats{$process_pid}->{HIGH_NR_CONTIG_DIRTY};
+                        if ($count != 0) {
+                                print "contig-dirty=$count ";
+                        }
+                }
+                print "\n";
+        }
+        # Print out kswapd activity
+        printf("\n");
+        printf("%-" . $max_strlen . "s %8s %10s   %8s   %8s %8s %8s\n", "Kswapd",   "Kswapd",  "Order",     "Pages",   "Pages",  "Pages");
+        printf("%-" . $max_strlen . "s %8s %10s   %8s   %8s %8s %8s\n", "Instance", "Wakeups", "Re-wakeup", "Scanned", "Sync-IO", "ASync-IO");
+        foreach $process_pid (keys %stats) {
+                if (!$stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE}) {
+                        next;
+                }
+                $total_kswapd_wake += $stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE};
+                $total_kswapd_nr_scanned += $stats{$process_pid}->{HIGH_NR_SCANNED};
+                $total_kswapd_writepage_file_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
+                $total_kswapd_writepage_anon_sync += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
+                $total_kswapd_writepage_file_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
+                $total_kswapd_writepage_anon_async += $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC};
+                printf("%-" . $max_strlen . "s %8d %10d   %8u   %8i %8u",
+                        $process_pid,
+                        $stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE},
+                        $stats{$process_pid}->{HIGH_KSWAPD_REWAKEUP},
+                        $stats{$process_pid}->{HIGH_NR_SCANNED},
+                        $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC},
+                        $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} + $stats{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC});
+                if ($stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE}) {
+                        print "      ";
+                        for (my $order = 0; $order < 20; $order++) {
+                                my $count = $stats{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE_PERORDER}[$order];
+                                if ($count != 0) {
+                                        print "wake-$order=$count ";
+                                }
+                        }
+                }
+                if ($stats{$process_pid}->{HIGH_KSWAPD_REWAKEUP}) {
+                        print "      ";
+                        for (my $order = 0; $order < 20; $order++) {
+                                my $count = $stats{$process_pid}->{HIGH_KSWAPD_REWAKEUP_PERORDER}[$order];
+                                if ($count != 0) {
+                                        print "rewake-$order=$count ";
+                                }
+                        }
+                }
+                printf("\n");
+        }
+        # Print out summaries
+        $total_direct_latency /= 1000;
+        $total_kswapd_latency /= 1000;
+        print "\nSummary\n";
+        print "Direct reclaims:                         $total_direct_reclaim\n";
+        print "Direct reclaim pages scanned:            $total_direct_nr_scanned\n";
+        print "Direct reclaim write file sync I/O:      $total_direct_writepage_file_sync\n";
+        print "Direct reclaim write anon sync I/O:      $total_direct_writepage_anon_sync\n";
+        print "Direct reclaim write file async I/O:     $total_direct_writepage_file_async\n";
+        print "Direct reclaim write anon async I/O:     $total_direct_writepage_anon_async\n";
+        print "Wake kswapd requests:                    $total_wakeup_kswapd\n";
+        printf "Time stalled direct reclaim:            %-1.2f seconds\n", $total_direct_latency;
+        print "\n";
+        print "Kswapd wakeups:                          $total_kswapd_wake\n";
+        print "Kswapd pages scanned:                    $total_kswapd_nr_scanned\n";
+        print "Kswapd reclaim write file sync I/O:      $total_kswapd_writepage_file_sync\n";
+        print "Kswapd reclaim write anon sync I/O:      $total_kswapd_writepage_anon_sync\n";
+        print "Kswapd reclaim write file async I/O:     $total_kswapd_writepage_file_async\n";
+        print "Kswapd reclaim write anon async I/O:     $total_kswapd_writepage_anon_async\n";
+        printf "Time kswapd awake:                      %-1.2f seconds\n", $total_kswapd_latency;
+}
+sub aggregate_perprocesspid() {
+        my $process_pid;
+        my $process;
+        undef %perprocess;
+        foreach $process_pid (keys %perprocesspid) {
+                $process = $process_pid;
+                $process =~ s/-([0-9])*$//;
+                if ($process eq '') {
+                        $process = "NO_PROCESS_NAME";
+                }
+                $perprocess{$process}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN} += $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN};
+                $perprocess{$process}->{MM_VMSCAN_KSWAPD_WAKE} += $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE};
+                $perprocess{$process}->{MM_VMSCAN_WAKEUP_KSWAPD} += $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD};
+                $perprocess{$process}->{HIGH_KSWAPD_REWAKEUP} += $perprocesspid{$process_pid}->{HIGH_KSWAPD_REWAKEUP};
+                $perprocess{$process}->{HIGH_NR_SCANNED} += $perprocesspid{$process_pid}->{HIGH_NR_SCANNED};
+                $perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_SYNC};
+                $perprocess{$process}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_SYNC};
+                $perprocess{$process}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_FILE_ASYNC};
+                $perprocess{$process}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC} += $perprocesspid{$process_pid}->{MM_VMSCAN_WRITEPAGE_ANON_ASYNC};
+                for (my $order = 0; $order < 20; $order++) {
+                        $perprocess{$process}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN_PERORDER}[$order] += $perprocesspid{$process_pid}->{MM_VMSCAN_DIRECT_RECLAIM_BEGIN_PERORDER}[$order];
+                        $perprocess{$process}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order] += $perprocesspid{$process_pid}->{MM_VMSCAN_WAKEUP_KSWAPD_PERORDER}[$order];
+                        $perprocess{$process}->{MM_VMSCAN_KSWAPD_WAKE_PERORDER}[$order] += $perprocesspid{$process_pid}->{MM_VMSCAN_KSWAPD_WAKE_PERORDER}[$order];
+                }
+                # Aggregate direct reclaim latencies
+                my $wr_index = $perprocess{$process}->{MM_VMSCAN_DIRECT_RECLAIM_END};
+                my $rd_index = 0;
+                while (defined $perprocesspid{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$rd_index]) {
+                        $perprocess{$process}->{HIGH_DIRECT_RECLAIM_LATENCY}[$wr_index] = $perprocesspid{$process_pid}->{HIGH_DIRECT_RECLAIM_LATENCY}[$rd_index];
+                        $rd_index++;
+                        $wr_index++;
+                }
+                $perprocess{$process}->{MM_VMSCAN_DIRECT_RECLAIM_END} = $wr_index;
+                # Aggregate kswapd latencies
+                my $wr_index = $perprocess{$process}->{MM_VMSCAN_KSWAPD_SLEEP};
+                my $rd_index = 0;
+                while (defined $perprocesspid{$process_pid}->{HIGH_KSWAPD_LATENCY}[$rd_index]) {
+                        $perprocess{$process}->{HIGH_KSWAPD_LATENCY}[$wr_index] = $perprocesspid{$process_pid}->{HIGH_KSWAPD_LATENCY}[$rd_index];
+                        $rd_index++;
+                        $wr_index++;
+                }
+                $perprocess{$process}->{MM_VMSCAN_DIRECT_RECLAIM_END} = $wr_index;
+        }
+}
+sub report() {
+        if (!$opt_ignorepid) {
+                dump_stats(\%perprocesspid);
+        } else {
+                aggregate_perprocesspid();
+                dump_stats(\%perprocess);
+        }
+}
+# Process events or signals until neither is available
+sub signal_loop() {
+        my $sigint_processed;
+        do {
+                $sigint_processed = 0;
+                process_events();
+                # Handle pending signals if any
+                if ($sigint_pending) {
+                        my $current_time = time;
+                        if ($sigint_exit) {
+                                print "Received exit signal\n";
+                                $sigint_pending = 0;
+                        }
+                        if ($sigint_report) {
+                                if ($current_time >= $sigint_received + 2) {
+                                        report();
+                                        $sigint_report = 0;
+                                        $sigint_pending = 0;
+                                        $sigint_processed = 1;
+                                }
+                        }
+                }
+        } while ($sigint_pending || $sigint_processed);
+}
+signal_loop();
+report();
diff --git a/Documentation/uml/UserModeLinux-HOWTO.txt b/Documentation/uml/UserModeLinux-HOWTO.txt
index 628013f944c4..9b7e1904db1c 100644
--- a/Documentation/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/uml/UserModeLinux-HOWTO.txt
@@ -8,62 +8,6 @@
  Table of Contents
  1. Introduction
     1.1 How is User Mode Linux Different?
@@ -277,8 +221,7 @@
  1. Download the latest UML patch from
-     the download page <http://user-mode-linux.sourceforge.net/dl-
+     the download page <http://user-mode-linux.sourceforge.net/
-     sf.html>
     In this example, the file is uml-patch-2.4.0-prerelease.bz2.
@@ -438,7 +381,7 @@
  as modules, especially filesystems and network protocols and filters,
  so most symbols which need to be exported probably already are.
  However, if you do find symbols that need exporting, let  us
-  <http://user-mode-linux.sourceforge.net/contacts.html>  know, and
+  <http://user-mode-linux.sourceforge.net/>  know, and
  they'll be "taken care of".
@@ -498,8 +441,8 @@
  You will need a filesystem to boot UML from.  There are a number
  available for download from  here  <http://user-mode-
-  linux.sourceforge.net/dl-sf.html> .  There are also  several tools
+  linux.sourceforge.net/> .  There are also  several tools
-  <http://user-mode-linux.sourceforge.net/fs_making.html>  which can be
+  <http://user-mode-linux.sourceforge.net/>  which can be
  used to generate UML-compatible filesystem images from media.
  The kernel will boot up and present you with a login prompt.
@@ -1236,7 +1179,7 @@
  Harald's original README is here <http://user-mode-linux.source-
-  forge.net/text/mcast.txt>  and explains these in detail, as well as
+  forge.net/>  and explains these in detail, as well as
  some other issues.
@@ -1311,7 +1254,7 @@
  kernel.
  These were pointed out by Tim Robinson <timro at trkr dot net> in
-  <http://www.geocrawler.com/lists/3/SourceForge/597/0/> name="this uml-
+  <http://www.geocrawler.com/> name="this uml-
  user post"> .
@@ -2038,7 +1981,7 @@
  uml_moo is installed with the UML deb and RPM.  If you didn't install
  UML from one of those packages, you can also get it from the UML
-  utilities <http://user-mode-linux.sourceforge.net/dl-sf.html#UML
+  utilities <http://user-mode-linux.sourceforge.net/
  utilities>  tar file in tools/moo.
@@ -4599,7 +4542,7 @@
  Michael Jennings <mikejen at hevanet.com>  sent in some material which
  is now gracing the top of the  index  page <http://user-mode-
-  linux.sourceforge.net/index.html>  of this site.
+  linux.sourceforge.net/>  of this site.
  SGI <http://www.sgi.com>  (and more specifically Ralf Baechle <ralf at
  uni-koblenz.de> ) gave me an account on oss.sgi.com
diff --git a/Documentation/usb/ehci.txt b/Documentation/usb/ehci.txt
index 1536b7e75134..9dcafa7d930d 100644
--- a/Documentation/usb/ehci.txt
+++ b/Documentation/usb/ehci.txt
@@ -9,7 +9,7 @@ compatible with the USB 1.1 standard. It defines three transfer speeds:
    - "Low Speed" 1.5 Mbit/sec
 USB 1.1 only addressed full speed and low speed.  High speed devices
-can be used on USB 1.1 systems, but they slow down to USB 1.1 speeds. 
+can be used on USB 1.1 systems, but they slow down to USB 1.1 speeds.
 USB 1.1 devices may also be used on USB 2.0 systems.  When plugged
 into an EHCI controller, they are given to a USB 1.1 "companion"
diff --git a/Documentation/usb/gadget_multi.txt b/Documentation/usb/gadget_multi.txt
new file mode 100644
index 000000000000..80f4ef0eb75b
--- /dev/null
+++ b/Documentation/usb/gadget_multi.txt
@@ -0,0 +1,150 @@
+                                                             -*- org -*-
+* Overview
+The Multifunction Composite Gadget (or g_multi) is a composite gadget
+that makes extensive use of the composite framework to provide
+a... multifunction gadget.
+In it's standard configuration it provides a single USB configuration
+with RNDIS[1] (that is Ethernet), USB CDC[2] ACM (that is serial) and
+USB Mass Storage functions.
+A CDC ECM (Ethernet) function may be turned on via a Kconfig option
+and RNDIS can be turned off.  If they are both enabled the gadget will
+have two configurations -- one with RNDIS and another with CDC ECM[3].
+Please not that if you use non-standard configuration (that is enable
+CDC ECM) you may need to change vendor and/or product ID.
+* Host drivers
+To make use of the gadget one needs to make it work on host side --
+without that there's no hope of achieving anything with the gadget.
+As one might expect, things one need to do very from system to system.
+** Linux host drivers
+Since the gadget uses standard composite framework and appears as such
+to Linux host it does not need any additional drivers on Linux host
+side.  All the functions are handled by respective drivers developed
+for them.
+This is also true for two configuration set-up with RNDIS
+configuration being the first one.  Linux host will use the second
+configuration with CDC ECM which should work better under Linux.
+** Windows host drivers
+For the gadget two work under Windows two conditions have to be met:
+*** Detecting as composite gadget
+First of all, Windows need to detect the gadget as an USB composite
+gadget which on its own have some conditions[4].  If they are met,
+Windows lets USB Generic Parent Driver[5] handle the device which then
+tries to much drivers for each individual interface (sort of, don't
+get into too many details).
+The good news is: you do not have to worry about most of the
+conditions!
+The only thing to worry is that the gadget has to have a single
+configuration so a dual RNDIS and CDC ECM gadget won't work unless you
+create a proper INF -- and of course, if you do submit it!
+*** Installing drivers for each function
+The other, trickier thing is making Windows install drivers for each
+individual function.
+For mass storage it is trivial since Windows detect it's an interface
+implementing USB Mass Storage class and selects appropriate driver.
+Things are harder with RDNIS and CDC ACM.
+**** RNDIS
+To make Windows select RNDIS drivers for the first function in the
+gadget, one needs to use the [[file:linux.inf]] file provided with this
+document.  It "attaches" Window's RNDIS driver to the first interface
+of the gadget.
+Please note, that while testing we encountered some issues[6] when
+RNDIS was not the first interface.  You do not need to worry abut it
+unless you are trying to develop your own gadget in which case watch
+out for this bug.
+**** CDC ACM
+Similarly, [[file:linux-cdc-acm.inf]] is provided for CDC ACM.
+**** Customising the gadget
+If you intend to hack the g_multi gadget be advised that rearranging
+functions will obviously change interface numbers for each of the
+functionality.  As an effect provided INFs won't work since they have
+interface numbers hard-coded in them (it's not hard to change those
+though[7]).
+This also means, that after experimenting with g_multi and changing
+provided functions one should change gadget's vendor and/or product ID
+so there will be no collision with other customised gadgets or the
+original gadget.
+Failing to comply may cause brain damage after wondering for hours why
+things don't work as intended before realising Windows have cached
+some drivers information (changing USB port may sometimes help plus
+you might try using USBDeview[8] to remove the phantom device).
+**** INF testing
+Provided INF files have been tested on Windows XP SP3, Windows Vista
+and Windows 7, all 32-bit versions.  It should work on 64-bit versions
+as well.  It most likely won't work on Windows prior to Windows XP
+SP2.
+** Other systems
+At this moment, drivers for any other systems have not been tested.
+Knowing how MacOS is based on BSD and BSD is an Open Source it is
+believed that it should (read: "I have no idea whether it will") work
+out-of-the-box.
+For more exotic systems I have even less to say...
+Any testing and drivers *are* *welcome*!
+* Authors
+This document has been written by Michal Nazarewicz
+([[mailto:mina86@mina86.com]]).  INF files have been hacked with
+support of Marek Szyprowski ([[mailto:m.szyprowski@samsung.com]]) and
+Xiaofan Chen ([[mailto:xiaofanc@gmail.com]]) basing on the MS RNDIS
+template[9], Microchip's CDC ACM INF file and David Brownell's
+([[mailto:dbrownell@users.sourceforge.net]]) original INF files.
+* Footnotes
+[1] Remote Network Driver Interface Specification,
+[[http://msdn.microsoft.com/en-us/library/ee484414.aspx]].
+[2] Communications Device Class Abstract Control Model, spec for this
+and other USB classes can be found at
+[[http://www.usb.org/developers/devclass_docs/]].
+[3] CDC Ethernet Control Model.
+[4] [[http://msdn.microsoft.com/en-us/library/ff537109(v=VS.85).aspx]]
+[5] [[http://msdn.microsoft.com/en-us/library/ff539234(v=VS.85).aspx]]
+[6] To put it in some other nice words, Windows failed to respond to
+any user input.
+[7] You may find [[http://www.cygnal.org/ubb/Forum9/HTML/001050.html]]
+useful.
+[8] http://www.nirsoft.net/utils/usb_devices_view.html
+[9] [[http://msdn.microsoft.com/en-us/library/ff570620.aspx]]
diff --git a/Documentation/usb/gadget_serial.txt b/Documentation/usb/gadget_serial.txt
index eac7df94d8e3..61e67f6a20a0 100644
--- a/Documentation/usb/gadget_serial.txt
+++ b/Documentation/usb/gadget_serial.txt
@@ -151,88 +151,23 @@ instructions below to install the host side driver.
 Installing the Windows Host ACM Driver
 --------------------------------------
-To use the Windows ACM driver you must have the files "gserial.inf"
+To use the Windows ACM driver you must have the "linux-cdc-acm.inf"
-and "usbser.sys" together in a folder on the Windows machine.
+file (provided along this document) which supports all recent versions
+of Windows.
-The "gserial.inf" file is given here.
-------------------- CUT HERE --------------------
-[Version]
-Signature="$Windows NT$"
-Class=Ports
-ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider=%LINUX%
-DriverVer=08/17/2004,0.0.2.0
-; Copyright (C) 2004 Al Borchers (alborchers@steinerpoint.com)
-[Manufacturer]
-%LINUX%=GSerialDeviceList
-[GSerialDeviceList]
-%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7
-[DestinationDirs]
-DefaultDestDir=10,System32\Drivers
-[GSerialInstall]
-CopyFiles=GSerialCopyFiles
-AddReg=GSerialAddReg
-[GSerialCopyFiles]
-usbser.sys
-[GSerialAddReg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,usbser.sys
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
-[GSerialInstall.Services]
-AddService = usbser,0x0002,GSerialService
-[GSerialService]
-DisplayName = %GSERIAL_DISPLAY_NAME%
-ServiceType = 1                  ; SERVICE_KERNEL_DRIVER
-StartType = 3                    ; SERVICE_DEMAND_START
-ErrorControl = 1                 ; SERVICE_ERROR_NORMAL
-ServiceBinary = %10%\System32\Drivers\usbser.sys
-LoadOrderGroup = Base
-[Strings]
-LINUX = "Linux"
-GSERIAL = "Gadget Serial"
-GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver"
-------------------- CUT HERE --------------------
-The "usbser.sys" file comes with various versions of Windows.
-For example, it can be found on Windows XP typically in
-  C:\WINDOWS\Driver Cache\i386\driver.cab
-Or it can be found on the Windows 98SE CD in the "win98" folder
-in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files.  You will
-need the DOS "expand" program, the Cygwin "cabextract" program, or
-a similar program to unpack these cab files and extract "usbser.sys".
-For example, to extract "usbser.sys" into the current directory
-on Windows XP, open a DOS window and run a command like
-  expand C:\WINDOWS\Driver~1\i386\driver.cab -F:usbser.sys .
-(Thanks to Nishant Kamat for pointing out this DOS command.)
 When the gadget serial driver is loaded and the USB device connected
 to the Windows host with a USB cable, Windows should recognize the
 gadget serial device and ask for a driver.  Tell Windows to find the
-driver in the folder that contains "gserial.inf" and "usbser.sys".
+driver in the folder that contains the "linux-cdc-acm.inf" file.
 For example, on Windows XP, when the gadget serial device is first
 plugged in, the "Found New Hardware Wizard" starts up.  Select
-"Install from a list or specific location (Advanced)", then on
+"Install from a list or specific location (Advanced)", then on the
-the next screen select "Include this location in the search" and
+next screen select "Include this location in the search" and enter the
-enter the path or browse to the folder containing "gserial.inf" and
+path or browse to the folder containing the "linux-cdc-acm.inf" file.
-"usbser.sys".  Windows will complain that the Gadget Serial driver
+Windows will complain that the Gadget Serial driver has not passed
-has not passed Windows Logo testing, but select "Continue anyway"
+Windows Logo testing, but select "Continue anyway" and finish the
-and finish the driver installation.
+driver installation.
 On Windows XP, in the "Device Manager" (under "Control Panel",
 "System", "Hardware") expand the "Ports (COM & LPT)" entry and you
@@ -345,5 +280,3 @@ you should be able to send data back and forth between the gadget
 side and host side systems.  Anything you type on the terminal
 window on the gadget side should appear in the terminal window on
 the host side and vice versa.
diff --git a/Documentation/usb/hotplug.txt b/Documentation/usb/hotplug.txt
index f53170665f37..4c945716a660 100644
--- a/Documentation/usb/hotplug.txt
+++ b/Documentation/usb/hotplug.txt
@@ -10,7 +10,7 @@ immediately usable.  That means the system must do many things, including:
    - Bind a driver to that device.  Bus frameworks do that using a
      device driver's probe() routine.
-    
    - Tell other subsystems to configure the new device.  Print
      queues may need to be enabled, networks brought up, disk
      partitions mounted, and so on.  In some cases these will
@@ -84,7 +84,7 @@ USB MODUTILS SUPPORT
 Current versions of module-init-tools will create a "modules.usbmap" file
 which contains the entries from each driver's MODULE_DEVICE_TABLE.  Such
 files can be used by various user mode policy agents to make sure all the
-right driver modules get loaded, either at boot time or later. 
+right driver modules get loaded, either at boot time or later.
 See <linux/usb.h> for full information about such table entries; or look
 at existing drivers.  Each table entry describes one or more criteria to
diff --git a/Documentation/usb/linux-cdc-acm.inf b/Documentation/usb/linux-cdc-acm.inf
new file mode 100644
index 000000000000..612e7220fb29
--- /dev/null
+++ b/Documentation/usb/linux-cdc-acm.inf
@@ -0,0 +1,107 @@
+; Windows USB CDC ACM Setup File
+; Based on INF template which was:
+;     Copyright (c) 2000 Microsoft Corporation
+;     Copyright (c) 2007 Microchip Technology Inc.
+; likely to be covered by the MLPL as found at:
+;    <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>.
+; For use only on Windows operating systems.
+[Version]
+Signature="$Windows NT$"
+Class=Ports
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
+Provider=%Linux%
+DriverVer=11/15/2007,5.1.2600.0
+[Manufacturer]
+%Linux%=DeviceList, NTamd64
+[DestinationDirs]
+DefaultDestDir=12
+;------------------------------------------------------------------------------
+;  Windows 2000/XP/Vista-32bit Sections
+;------------------------------------------------------------------------------
+[DriverInstall.nt]
+include=mdmcpq.inf
+CopyFiles=DriverCopyFiles.nt
+AddReg=DriverInstall.nt.AddReg
+[DriverCopyFiles.nt]
+usbser.sys,,,0x20
+[DriverInstall.nt.AddReg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,USBSER.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+[DriverInstall.nt.Services]
+AddService=usbser, 0x00000002, DriverService.nt
+[DriverService.nt]
+DisplayName=%SERVICE%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\USBSER.sys
+;------------------------------------------------------------------------------
+;  Vista-64bit Sections
+;------------------------------------------------------------------------------
+[DriverInstall.NTamd64]
+include=mdmcpq.inf
+CopyFiles=DriverCopyFiles.NTamd64
+AddReg=DriverInstall.NTamd64.AddReg
+[DriverCopyFiles.NTamd64]
+USBSER.sys,,,0x20
+[DriverInstall.NTamd64.AddReg]
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,USBSER.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+[DriverInstall.NTamd64.Services]
+AddService=usbser, 0x00000002, DriverService.NTamd64
+[DriverService.NTamd64]
+DisplayName=%SERVICE%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\USBSER.sys
+;------------------------------------------------------------------------------
+;  Vendor and Product ID Definitions
+;------------------------------------------------------------------------------
+; When developing your USB device, the VID and PID used in the PC side
+; application program and the firmware on the microcontroller must match.
+; Modify the below line to use your VID and PID.  Use the format as shown
+; below.
+; Note: One INF file can be used for multiple devices with different
+;       VID and PIDs.  For each supported device, append
+;       ",USB\VID_xxxx&PID_yyyy" to the end of the line.
+;------------------------------------------------------------------------------
+[SourceDisksFiles]
+[SourceDisksNames]
+[DeviceList]
+%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02
+[DeviceList.NTamd64]
+%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_0525&PID_A4AB&MI_02
+;------------------------------------------------------------------------------
+;  String Definitions
+;------------------------------------------------------------------------------
+;Modify these strings to customize your device
+;------------------------------------------------------------------------------
+[Strings]
+Linux               = "Linux Developer Community"
+DESCRIPTION         = "Gadget Serial"
+SERVICE             = "USB RS-232 Emulation Driver"
diff --git a/Documentation/usb/linux.inf b/Documentation/usb/linux.inf
index 2f7217d124ff..4dee95851224 100644
--- a/Documentation/usb/linux.inf
+++ b/Documentation/usb/linux.inf
@@ -1,200 +1,66 @@
-; MS-Windows driver config matching some basic modes of the
+; Based on template INF file found at
-; Linux-USB Ethernet/RNDIS gadget firmware:
+;    <http://msdn.microsoft.com/en-us/library/ff570620.aspx>
-;
+; which was:
-;  - RNDIS plus CDC Ethernet ... this may be familiar as a DOCSIS
+;    Copyright (c) Microsoft Corporation
-;    cable modem profile, and supports most non-Microsoft USB hosts
+; and released under the MLPL as found at:
-;
+;    <http://msdn.microsoft.com/en-us/cc300389.aspx#MLPL>.
-;  - RNDIS plus CDC Subset ... used by hardware that incapable of
+; For use only on Windows operating systems.
-;    full CDC Ethernet support.
-;
-; Microsoft only directly supports RNDIS drivers, and bundled them into XP.
-; The Microsoft "Remote NDIS USB Driver Kit" is currently found at:
-;   http://www.microsoft.com/whdc/hwdev/resources/HWservices/rndis.mspx
 [Version]
-Signature           = "$CHICAGO$"
+Signature           = "$Windows NT$"
 Class               = Net
 ClassGUID           = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider            = %Linux%
-Compatible          = 1
+DriverVer           = 06/21/2006,6.0.6000.16384
-MillenniumPreferred = .ME
-DriverVer           = 03/30/2004,0.0.0.0
-; catalog file would be used by WHQL
-;CatalogFile         = Linux.cat
 [Manufacturer]
-%Linux%          = LinuxDevices,NT.5.1
+%Linux%             = LinuxDevices,NTx86,NTamd64,NTia64
+; Decoration for x86 architecture
+[LinuxDevices.NTx86]
+%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00
-[LinuxDevices]
+; Decoration for x64 architecture
-; NetChip IDs, used by both firmware modes
+[LinuxDevices.NTamd64]
-%LinuxDevice%    = RNDIS, USB\VID_0525&PID_a4a2
+%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00
-[LinuxDevices.NT.5.1]
+; Decoration for ia64 architecture
-%LinuxDevice%    = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2
+[LinuxDevices.NTia64]
+%LinuxDevice%       = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00
+;@@@ This is the common setting for setup
 [ControlFlags]
 ExcludeFromSelect=*
-; Windows 98, Windows 98 Second Edition specific sections --------
+; DDInstall section
+; References the in-build Netrndis.inf
-[RNDIS]
-DeviceID        = usb8023
-MaxInstance     = 512
-DriverVer           = 03/30/2004,0.0.0.0
-AddReg          = RNDIS_AddReg_98, RNDIS_AddReg_Common
-[RNDIS_AddReg_98]
-HKR, ,               DevLoader,        0, *ndis
-HKR, ,               DeviceVxDs,       0, usb8023.sys
-HKR, NDIS,           LogDriverName,    0, "usb8023"
-HKR, NDIS,           MajorNdisVersion, 1, 5
-HKR, NDIS,           MinorNdisVersion, 1, 0
-HKR, Ndi\Interfaces, DefUpper,         0, "ndis3,ndis4,ndis5"
-HKR, Ndi\Interfaces, DefLower,         0, "ethernet"
-HKR, Ndi\Interfaces, UpperRange,       0, "ndis3,ndis4,ndis5"
-HKR, Ndi\Interfaces, LowerRange,       0, "ethernet"
-HKR, Ndi\Install,    ndis3,            0, "RNDIS_Install_98"
-HKR, Ndi\Install,    ndis4,            0, "RNDIS_Install_98"
-HKR, Ndi\Install,    ndis5,            0, "RNDIS_Install_98"
-HKR, Ndi,            DeviceId,         0, "USB\VID_0525&PID_a4a2"
-[RNDIS_Install_98]
-CopyFiles=RNDIS_CopyFiles_98
-[RNDIS_CopyFiles_98]
-usb8023.sys, usb8023w.sys, , 0 
-rndismp.sys, rndismpw.sys, , 0 
-; Windows Millennium Edition specific sections --------------------
-[RNDIS.ME]
-DeviceID        = usb8023
-MaxInstance     = 512
-DriverVer           = 03/30/2004,0.0.0.0
-AddReg          = RNDIS_AddReg_ME, RNDIS_AddReg_Common
-Characteristics = 0x84   ; NCF_PHYSICAL + NCF_HAS_UI
-BusType         = 15
-[RNDIS_AddReg_ME]
-HKR, ,               DevLoader,        0, *ndis
-HKR, ,               DeviceVxDs,       0, usb8023.sys
-HKR, NDIS,           LogDriverName,    0, "usb8023"
-HKR, NDIS,           MajorNdisVersion, 1, 5
-HKR, NDIS,           MinorNdisVersion, 1, 0
-HKR, Ndi\Interfaces, DefUpper,         0, "ndis3,ndis4,ndis5"
-HKR, Ndi\Interfaces, DefLower,         0, "ethernet"
-HKR, Ndi\Interfaces, UpperRange,       0, "ndis3,ndis4,ndis5"
-HKR, Ndi\Interfaces, LowerRange,       0, "ethernet"
-HKR, Ndi\Install,    ndis3,            0, "RNDIS_Install_ME"
-HKR, Ndi\Install,    ndis4,            0, "RNDIS_Install_ME"
-HKR, Ndi\Install,    ndis5,            0, "RNDIS_Install_ME"
-HKR, Ndi,            DeviceId,         0, "USB\VID_0525&PID_a4a2"
-[RNDIS_Install_ME]
-CopyFiles=RNDIS_CopyFiles_ME
-[RNDIS_CopyFiles_ME]
-usb8023.sys, usb8023m.sys, , 0 
-rndismp.sys, rndismpm.sys, , 0 
-; Windows 2000 specific sections ---------------------------------
-[RNDIS.NT]
-Characteristics = 0x84   ; NCF_PHYSICAL + NCF_HAS_UI
-BusType         = 15
-DriverVer           = 03/30/2004,0.0.0.0
-AddReg          = RNDIS_AddReg_NT, RNDIS_AddReg_Common
-CopyFiles       = RNDIS_CopyFiles_NT
-[RNDIS.NT.Services]
-AddService = USB_RNDIS, 2, RNDIS_ServiceInst_NT, RNDIS_EventLog
-[RNDIS_CopyFiles_NT]
-; no rename of files on Windows 2000, use the 'k' names as is
-usb8023k.sys, , , 0 
-rndismpk.sys, , , 0 
-[RNDIS_ServiceInst_NT]
-DisplayName     = %ServiceDisplayName%
-ServiceType     = 1 
-StartType       = 3 
-ErrorControl    = 1 
-ServiceBinary   = %12%\usb8023k.sys    
-LoadOrderGroup  = NDIS
-AddReg          = RNDIS_WMI_AddReg_NT
-[RNDIS_WMI_AddReg_NT]
-HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismpk.sys"
-; Windows XP specific sections -----------------------------------
 [RNDIS.NT.5.1]
-Characteristics = 0x84   ; NCF_PHYSICAL + NCF_HAS_UI
+Characteristics     = 0x84   ; NCF_PHYSICAL + NCF_HAS_UI
-BusType         = 15
+BusType             = 15
-DriverVer           = 03/30/2004,0.0.0.0
+; NEVER REMOVE THE FOLLOWING REFERENCE FOR NETRNDIS.INF
-AddReg          = RNDIS_AddReg_NT, RNDIS_AddReg_Common
+include             = netrndis.inf
-; no copyfiles - the files are already in place
+needs               = Usb_Rndis.ndi
+AddReg              = Rndis_AddReg_Vista
+; DDInstal.Services section
 [RNDIS.NT.5.1.Services]
-AddService      = USB_RNDIS, 2, RNDIS_ServiceInst_51, RNDIS_EventLog
+include             = netrndis.inf
+needs               = Usb_Rndis.ndi.Services
-[RNDIS_ServiceInst_51]
-DisplayName     = %ServiceDisplayName%
+; Optional registry settings. You can modify as needed.
-ServiceType     = 1 
+[RNDIS_AddReg_Vista]
-StartType       = 3 
+HKR, NDI\params\VistaProperty, ParamDesc,  0, %Vista_Property%
-ErrorControl    = 1 
+HKR, NDI\params\VistaProperty, type,       0, "edit"
-ServiceBinary   = %12%\usb8023.sys    
+HKR, NDI\params\VistaProperty, LimitText,  0, "12"
-LoadOrderGroup  = NDIS
+HKR, NDI\params\VistaProperty, UpperCase,  0, "1"
-AddReg          = RNDIS_WMI_AddReg_51
+HKR, NDI\params\VistaProperty, default,    0, " "
+HKR, NDI\params\VistaProperty, optional,   0, "1"
-[RNDIS_WMI_AddReg_51]
-HKR, , MofImagePath, 0x00020000, "System32\drivers\rndismp.sys"
+; No sys copyfiles - the sys files are already in-build
+; (part of the operating system).
-; Windows 2000 and Windows XP common sections --------------------
+; We do not support XP SP1-, 2003 SP1-, ME, 9x.
-[RNDIS_AddReg_NT]
-HKR, Ndi,               Service,        0, "USB_RNDIS"
-HKR, Ndi\Interfaces,    UpperRange,     0, "ndis5" 
-HKR, Ndi\Interfaces,    LowerRange,     0, "ethernet"
-[RNDIS_EventLog]
-AddReg = RNDIS_EventLog_AddReg
-[RNDIS_EventLog_AddReg]
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\netevent.dll"
-HKR, , TypesSupported,   0x00010001, 7
-; Common Sections -------------------------------------------------
-[RNDIS_AddReg_Common]
-HKR, NDI\params\NetworkAddress, ParamDesc,  0, %NetworkAddress%
-HKR, NDI\params\NetworkAddress, type,       0, "edit"
-HKR, NDI\params\NetworkAddress, LimitText,  0, "12"
-HKR, NDI\params\NetworkAddress, UpperCase,  0, "1"
-HKR, NDI\params\NetworkAddress, default,    0, " "
-HKR, NDI\params\NetworkAddress, optional,   0, "1"
-[SourceDisksNames]
-1=%SourceDisk%,,1
-[SourceDisksFiles]
-usb8023m.sys=1
-rndismpm.sys=1
-usb8023w.sys=1
-rndismpw.sys=1
-usb8023k.sys=1
-rndismpk.sys=1
-[DestinationDirs]
-RNDIS_CopyFiles_98    = 10, system32/drivers
-RNDIS_CopyFiles_ME    = 10, system32/drivers
-RNDIS_CopyFiles_NT    = 12
 [Strings]
-ServiceDisplayName    = "USB Remote NDIS Network Device Driver"
-NetworkAddress        = "Network Address"
 Linux                 = "Linux Developer Community"
 LinuxDevice           = "Linux USB Ethernet/RNDIS Gadget"
-SourceDisk            = "Ethernet/RNDIS Gadget Driver Install Disk"
+Vista_Property        = "Optional Vista Property"
diff --git a/Documentation/usb/mtouchusb.txt b/Documentation/usb/mtouchusb.txt
index e43cfffaa100..86302cd53ed3 100644
--- a/Documentation/usb/mtouchusb.txt
+++ b/Documentation/usb/mtouchusb.txt
@@ -54,10 +54,6 @@ generic functions like calibrations, resets, and vendor information can be
 requested from the userspace (And the drivers would handle the vendor specific
 tasks).
-ADDITIONAL INFORMATION/UPDATES/X CONFIGURATION EXAMPLE:
-http://groomlakelabs.com/grandamp/code/microtouch/
 TODO:
 Implement a control urb again to handle requests to and from the device
@@ -68,7 +64,7 @@ DISCLAIMER:
 I am not a MicroTouch/3M employee, nor have I ever been.  3M does not support 
 this driver!  If you want touch drivers only supported within X, please go to:
-http://www.3m.com/3MTouchSystems/downloads/
+http://www.3m.com/3MTouchSystems/
 THANKS:
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index f4d214510259..5bd7926185e8 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -83,7 +83,7 @@ HandSpring Visor, Palm USB, and Clié USB driver
  parameters.  e.g. modprobe visor vendor=0x54c product=0x66
  
  There is a webpage and mailing lists for this portion of the driver at:
-  http://usbvisor.sourceforge.net/
+  http://sourceforge.net/projects/usbvisor/
  For any questions or problems with this driver, please contact Greg
  Kroah-Hartman at greg@kroah.com
@@ -184,7 +184,7 @@ Keyspan USA-series Serial Adapters
    functionality.
  
  More information is available at:
-        http://misc.nu/hugh/keyspan.html
+        http://www.carnationsoftware.com/carnation/Keyspan.html
   
  For any questions or problems with this driver, please contact Hugh
  Blemings at hugh@misc.nu
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html
index d749d41f647b..d72fd2aa9158 100644
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
@@ -17,7 +17,7 @@
   </tr>
   <tr>
    <td>
-     <a href="http://www.linuxtv.org/downloads/video4linux/API/V4L2_API">V4L2 API</a>
+     <a href="http://v4l2spec.bytesex.org/spec-single/v4l2.html">V4L2 API</a>
    </td>
    <td>Should be used for new projects
    </td>
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 16ca030e1185..87c46347bd63 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -17,9 +17,9 @@
 16 -> DVBWorld DVB-S2 2005                                [0001:2005]
 17 -> NetUP Dual DVB-S2 CI                                [1b55:2a2c]
 18 -> Hauppauge WinTV-HVR1270                             [0070:2211]
- 19 -> Hauppauge WinTV-HVR1275                             [0070:2215]
+ 19 -> Hauppauge WinTV-HVR1275                             [0070:2215,0070:221d,0070:22f2]
- 20 -> Hauppauge WinTV-HVR1255                             [0070:2251]
+ 20 -> Hauppauge WinTV-HVR1255                             [0070:2251,0070:2259,0070:22f1]
- 21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295]
+ 21 -> Hauppauge WinTV-HVR1210                             [0070:2291,0070:2295,0070:2299,0070:229d,0070:22f0,0070:22f3,0070:22f4,0070:22f5]
 22 -> Mygica X8506 DMB-TH                                 [14f1:8651]
 23 -> Magic-Pro ProHDTV Extreme 2                         [14f1:8657]
 24 -> Hauppauge WinTV-HVR1850                             [0070:8541]
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index 3a623aaeae5f..5c568757c301 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -72,3 +72,4 @@
 73 -> Reddo DVB-C USB TV Box                   (em2870)
 74 -> Actionmaster/LinXcel/Digitus VC211A      (em2800)
 75 -> Dikom DK300                              (em2882)
+ 76 -> KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 1387a69ae3aa..4000c29fcfb6 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -178,4 +178,5 @@
 177 -> Hawell HW-404M7
 178 -> Beholder BeholdTV H7                     [5ace:7190]
 179 -> Beholder BeholdTV A7                     [5ace:7090]
-180 -> Avermedia M733A                          [1461:4155,1461:4255]
+180 -> Avermedia PCI M733A                      [1461:4155,1461:4255]
+181 -> TechoTrend TT-budget T-3000              [13c2:2804]
diff --git a/Documentation/video4linux/CQcam.txt b/Documentation/video4linux/CQcam.txt
index d230878e473e..8977e7ce4dab 100644
--- a/Documentation/video4linux/CQcam.txt
+++ b/Documentation/video4linux/CQcam.txt
@@ -203,11 +203,11 @@ The V4L2 API spec:
  http://v4l2spec.bytesex.org/
 Some web pages about the quickcams:
-   http://www.dkfz-heidelberg.de/Macromol/wedemann/mini-HOWTO-cqcam.html
+   http://www.pingouin-land.com/howto/QuickCam-HOWTO.html
   http://www.crynwr.com/qcpc/            QuickCam Third-Party Drivers
   http://www.crynwr.com/qcpc/re.html     Some Reverse Engineering
-   http://cse.unl.edu/~cluening/gqcam/    v4l client
+   http://www.wirelesscouch.net/software/gqcam/   v4l client
   http://phobos.illtel.denver.co.us/pub/qcread/ doesn't use v4l
   ftp://ftp.cs.unm.edu/pub/chris/quickcam/   Has lots of drivers
   http://www.cs.duke.edu/~reynolds/quickcam/ Has lots of information
diff --git a/Documentation/video4linux/README.cpia b/Documentation/video4linux/README.cpia
index 19cd3bf24981..8a747fee661f 100644
--- a/Documentation/video4linux/README.cpia
+++ b/Documentation/video4linux/README.cpia
@@ -185,7 +185,7 @@ THANKS (in no particular order):
 ---------------------------------------------------------------------------
 REFERENCES
-   1. http://www.risc.uni-linz.ac.at/people/ppregler
+   1. http://www.risc.uni-linz.ac.at/
      mailto:Peter_Pregler@email.com
   2. see the file COPYING in the top directory of the kernel tree
   3. http://webcam.sourceforge.net/
diff --git a/Documentation/video4linux/README.ivtv b/Documentation/video4linux/README.ivtv
index 73df22c40bfe..42b06686eb78 100644
--- a/Documentation/video4linux/README.ivtv
+++ b/Documentation/video4linux/README.ivtv
@@ -10,7 +10,7 @@ Hauppauge PVR-350.
 NOTE: this driver requires the latest encoder firmware (version 2.06.039, size
 376836 bytes). Get the firmware from here:
-http://dl.ivtvdriver.org/ivtv/firmware/firmware.tar.gz
+http://dl.ivtvdriver.org/ivtv/firmware/
 NOTE: 'normal' TV applications do not work with this driver, you need
 an application that can handle MPEG input such as mplayer, xine, MythTV,
diff --git a/Documentation/video4linux/Zoran b/Documentation/video4linux/Zoran
index 0e89e7676298..00e3f9267814 100644
--- a/Documentation/video4linux/Zoran
+++ b/Documentation/video4linux/Zoran
@@ -174,7 +174,7 @@ and is used in Argentinia, Uruguay, an a few others
 We do not talk about how the audio is broadcast !
 A rather good sites about the TV standards are:
-http://www.sony.jp/ServiceArea/Voltage_map/
+http://www.sony.jp/support/
 http://info.electronicwerkstatt.de/bereiche/fernsehtechnik/frequenzen_und_normen/Fernsehnormen/
 and http://www.cabl.com/restaurant/channel.html
@@ -330,7 +330,7 @@ These extensions are known as the v4l/mjpeg extensions. See zoran.h for
 details (structs/ioctls).
 Information - video4linux:
-http://roadrunner.swansea.linux.org.uk/v4lapi.shtml
+http://linux.bytesex.org/v4l2/API.html
 Documentation/video4linux/API.html
 /usr/include/linux/videodev.h
@@ -390,7 +390,7 @@ BUZIOC_G_STATUS
 Get the status of the input lines (video source connected/norm).
 For programming example, please, look at lavrec.c and lavplay.c code in
-lavtools-1.2p2 package (URL: http://www.cicese.mx/~mirsev/DC10plus/)
+lavtools-1.2p2 package (URL: http://www.cicese.mx/)
 and the 'examples' directory in the original Buz driver distribution.
 Additional notes for software developers:
diff --git a/Documentation/video4linux/bttv/Cards b/Documentation/video4linux/bttv/Cards
index d3389655ad96..12217fc49725 100644
--- a/Documentation/video4linux/bttv/Cards
+++ b/Documentation/video4linux/bttv/Cards
@@ -802,7 +802,7 @@ Kworld (www.kworld.com.tw)
-JTT/ Justy Corp.http://www.justy.co.jp/ (www.jtt.com.jp website down)
+JTT/ Justy Corp.(http://www.jtt.ne.jp/)
 ---------------------------------------------------------------------
   JTT-02 (JTT TV) "TV watchmate pro" (bt848)
@@ -828,7 +828,7 @@ Eline www.eline-net.com/
   Eline Vision TVMaster / TVMaster FM (ELV-TVM/ ELV-TVM-FM) = LR26  (bt878)
   Eline Vision TVMaster-2000 (ELV-TVM-2000, ELV-TVM-2000-FM)= LR138 (saa713x)
-Spirit http://www.spiritmodems.com.au/
+Spirit 
 ------
   Spirit TV Tuner/Video Capture Card (bt848)
@@ -959,6 +959,6 @@ Asus www.asuscom.com
 Hoontech
 --------
-http://www.hoontech.com/korean/download/down_driver_list03.html
+http://www.hoontech.de/
   HART Vision 848 (H-ART Vision 848)
   HART Vision 878 (H-Art Vision 878)
diff --git a/Documentation/video4linux/bttv/MAKEDEV b/Documentation/video4linux/bttv/MAKEDEV
index 6c29ba43b6c6..9d112f7fd5f7 100644
--- a/Documentation/video4linux/bttv/MAKEDEV
+++ b/Documentation/video4linux/bttv/MAKEDEV
@@ -14,7 +14,7 @@ function makedev () {
        ln -s /dev/${1}0 /dev/$1
 }
-# see http://roadrunner.swansea.uk.linux.org/v4lapi.shtml
+# see http://linux.bytesex.org/v4l2/API.html
 echo "*** new device names ***"
 makedev video 0
diff --git a/Documentation/video4linux/bttv/Specs b/Documentation/video4linux/bttv/Specs
index 79b9e576fe79..f32466cdae05 100644
--- a/Documentation/video4linux/bttv/Specs
+++ b/Documentation/video4linux/bttv/Specs
@@ -1,3 +1,3 @@
 Philips         http://www.Semiconductors.COM/pip/
-Conexant        http://www.conexant.com/techinfo/default.asp
+Conexant        http://www.conexant.com/
-Micronas        http://www.micronas.de/pages/product_documentation/index.html
+Micronas        http://www.micronas.com/en/home/index.html
diff --git a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
index faccee68f603..f4329a38878e 100644
--- a/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/cx88/hauppauge-wintv-cx88-ir.txt
@@ -44,7 +44,7 @@ http://www.atmel.com/dyn/resources/prod_documents/doc2817.pdf
 This data sheet (google search) seems to have a lovely description of the
 RC5 basics
-http://users.pandora.be/nenya/electronics/rc5/  and more data
+http://www.nenya.be/beor/electronics/rc5.htm  and more data
 http://www.ee.washington.edu/circuit_archive/text/ir_decode.txt
 and even a reference to how to decode a bi-phase data stream.
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index f13eb036c439..56ba7bba7168 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -29,8 +29,12 @@ zc3xx		041e:4029	Creative WebCam Vista Pro
 zc3xx           041e:4034       Creative Instant P0620
 zc3xx           041e:4035       Creative Instant P0620D
 zc3xx           041e:4036       Creative Live !
+sq930x          041e:4038       Creative Joy-IT
 zc3xx           041e:403a       Creative Nx Pro 2
 spca561         041e:403b       Creative Webcam Vista (VF0010)
+sq930x          041e:403c       Creative Live! Ultra
+sq930x          041e:403d       Creative Live! Ultra for Notebooks
+sq930x          041e:4041       Creative Live! Motion
 zc3xx           041e:4051       Creative Live!Cam Notebook Pro (VF0250)
 ov519           041e:4052       Creative Live! VISTA IM
 zc3xx           041e:4053       Creative Live!Cam Video IM
@@ -138,6 +142,7 @@ finepix		04cb:013d	Fujifilm FinePix unknown model
 finepix         04cb:013f       Fujifilm FinePix F420
 sunplus         04f1:1001       JVC GC A50
 spca561         04fc:0561       Flexcam 100
+spca1528        04fc:1528       Sunplus MD80 clone
 sunplus         04fc:500c       Sunplus CA500C
 sunplus         04fc:504a       Aiptek Mini PenCam 1.3
 sunplus         04fc:504b       Maxell MaxPocket LE 1.3
@@ -253,6 +258,7 @@ pac7302		093a:2620	Apollo AC-905
 pac7302         093a:2621       PAC731x
 pac7302         093a:2622       Genius Eye 312
 pac7302         093a:2624       PAC7302
+pac7302         093a:2625       Genius iSlim 310
 pac7302         093a:2626       Labtec 2200
 pac7302         093a:2628       Genius iLook 300
 pac7302         093a:2629       Genious iSlim 300
@@ -362,6 +368,8 @@ sq905c		2770:9052	Disney pix micro 2 (VGA)
 sq905c          2770:905c       All 11 known cameras with this ID
 sq905           2770:9120       All 24 known cameras with this ID
 sq905c          2770:913d       All 4 known cameras with this ID
+sq930x          2770:930b       Sweex Motion Tracking / I-Tec iCam Tracer
+sq930x          2770:930c       Trust WB-3500T / NSG Robbie 2.0
 spca500         2899:012c       Toptro Industrial
 ov519           8020:ef04       ov519
 spca508         8086:0110       Intel Easy PC Camera
diff --git a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
index faccee68f603..a2fd363c40c8 100644
--- a/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
+++ b/Documentation/video4linux/hauppauge-wintv-cx88-ir.txt
@@ -44,7 +44,7 @@ http://www.atmel.com/dyn/resources/prod_documents/doc2817.pdf
 This data sheet (google search) seems to have a lovely description of the
 RC5 basics
-http://users.pandora.be/nenya/electronics/rc5/  and more data
+http://www.nenya.be/beor/electronics/rc5.htm and more data
 http://www.ee.washington.edu/circuit_archive/text/ir_decode.txt
 and even a reference to how to decode a bi-phase data stream.
diff --git a/Documentation/video4linux/ibmcam.txt b/Documentation/video4linux/ibmcam.txt
index 397a94eb77b8..a51055211e62 100644
--- a/Documentation/video4linux/ibmcam.txt
+++ b/Documentation/video4linux/ibmcam.txt
@@ -27,9 +27,8 @@ SUPPORTED CAMERAS:
 Xirlink "C-It" camera, also known as "IBM PC Camera".
 The device uses proprietary ASIC (and compression method);
-it is manufactured by Xirlink. See http://www.xirlink.com/
+it is manufactured by Xirlink. See http://xirlinkwebcam.sourceforge.net, 
-(renamed to http://www.veo.com), http://www.ibmpccamera.com,
+http://www.ibmpccamera.com, or http://www.c-itnow.com/ for details and pictures.
-or http://www.c-itnow.com/ for details and pictures.
 This very chipset ("X Chip", as marked at the factory)
 is used in several other cameras, and they are supported
diff --git a/Documentation/video4linux/se401.txt b/Documentation/video4linux/se401.txt
index 7b9d1c960a10..bd6526ec8dd7 100644
--- a/Documentation/video4linux/se401.txt
+++ b/Documentation/video4linux/se401.txt
@@ -49,6 +49,6 @@ order to increase the throughput (and thus framerate).
 HELP:
 The latest info on this driver can be found at:
-http://www.chello.nl/~j.vreeken/se401/
+http://members.chello.nl/~j.vreeken/se401/
 And questions to me can be send to:
 pe1rxq@amsat.org
diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/video4linux/v4l2-controls.txt
new file mode 100644
index 000000000000..8773778d23fc
--- /dev/null
+++ b/Documentation/video4linux/v4l2-controls.txt
@@ -0,0 +1,648 @@
+Introduction
+============
+The V4L2 control API seems simple enough, but quickly becomes very hard to
+implement correctly in drivers. But much of the code needed to handle controls
+is actually not driver specific and can be moved to the V4L core framework.
+After all, the only part that a driver developer is interested in is:
+1) How do I add a control?
+2) How do I set the control's value? (i.e. s_ctrl)
+And occasionally:
+3) How do I get the control's value? (i.e. g_volatile_ctrl)
+4) How do I validate the user's proposed control value? (i.e. try_ctrl)
+All the rest is something that can be done centrally.
+The control framework was created in order to implement all the rules of the
+V4L2 specification with respect to controls in a central place. And to make
+life as easy as possible for the driver developer.
+Note that the control framework relies on the presence of a struct v4l2_device
+for V4L2 drivers and struct v4l2_subdev for sub-device drivers.
+Objects in the framework
+========================
+There are two main objects:
+The v4l2_ctrl object describes the control properties and keeps track of the
+control's value (both the current value and the proposed new value).
+v4l2_ctrl_handler is the object that keeps track of controls. It maintains a
+list of v4l2_ctrl objects that it owns and another list of references to
+controls, possibly to controls owned by other handlers.
+Basic usage for V4L2 and sub-device drivers
+===========================================
+1) Prepare the driver:
+1.1) Add the handler to your driver's top-level struct:
+        struct foo_dev {
+                ...
+                struct v4l2_ctrl_handler ctrl_handler;
+                ...
+        };
+        struct foo_dev *foo;
+1.2) Initialize the handler:
+        v4l2_ctrl_handler_init(&foo->ctrl_handler, nr_of_controls);
+  The second argument is a hint telling the function how many controls this
+  handler is expected to handle. It will allocate a hashtable based on this
+  information. It is a hint only.
+1.3) Hook the control handler into the driver:
+1.3.1) For V4L2 drivers do this:
+        struct foo_dev {
+                ...
+                struct v4l2_device v4l2_dev;
+                ...
+                struct v4l2_ctrl_handler ctrl_handler;
+                ...
+        };
+        foo->v4l2_dev.ctrl_handler = &foo->ctrl_handler;
+  Where foo->v4l2_dev is of type struct v4l2_device.
+  Finally, remove all control functions from your v4l2_ioctl_ops:
+  vidioc_queryctrl, vidioc_querymenu, vidioc_g_ctrl, vidioc_s_ctrl,
+  vidioc_g_ext_ctrls, vidioc_try_ext_ctrls and vidioc_s_ext_ctrls.
+  Those are now no longer needed.
+1.3.2) For sub-device drivers do this:
+        struct foo_dev {
+                ...
+                struct v4l2_subdev sd;
+                ...
+                struct v4l2_ctrl_handler ctrl_handler;
+                ...
+        };
+        foo->sd.ctrl_handler = &foo->ctrl_handler;
+  Where foo->sd is of type struct v4l2_subdev.
+  And set all core control ops in your struct v4l2_subdev_core_ops to these
+  helpers:
+        .queryctrl = v4l2_subdev_queryctrl,
+        .querymenu = v4l2_subdev_querymenu,
+        .g_ctrl = v4l2_subdev_g_ctrl,
+        .s_ctrl = v4l2_subdev_s_ctrl,
+        .g_ext_ctrls = v4l2_subdev_g_ext_ctrls,
+        .try_ext_ctrls = v4l2_subdev_try_ext_ctrls,
+        .s_ext_ctrls = v4l2_subdev_s_ext_ctrls,
+  Note: this is a temporary solution only. Once all V4L2 drivers that depend
+  on subdev drivers are converted to the control framework these helpers will
+  no longer be needed.
+1.4) Clean up the handler at the end:
+        v4l2_ctrl_handler_free(&foo->ctrl_handler);
+2) Add controls:
+You add non-menu controls by calling v4l2_ctrl_new_std:
+        struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl,
+                        const struct v4l2_ctrl_ops *ops,
+                        u32 id, s32 min, s32 max, u32 step, s32 def);
+Menu controls are added by calling v4l2_ctrl_new_std_menu:
+        struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
+                        const struct v4l2_ctrl_ops *ops,
+                        u32 id, s32 max, s32 skip_mask, s32 def);
+These functions are typically called right after the v4l2_ctrl_handler_init:
+        v4l2_ctrl_handler_init(&foo->ctrl_handler, nr_of_controls);
+        v4l2_ctrl_new_std(&foo->ctrl_handler, &foo_ctrl_ops,
+                        V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
+        v4l2_ctrl_new_std(&foo->ctrl_handler, &foo_ctrl_ops,
+                        V4L2_CID_CONTRAST, 0, 255, 1, 128);
+        v4l2_ctrl_new_std_menu(&foo->ctrl_handler, &foo_ctrl_ops,
+                        V4L2_CID_POWER_LINE_FREQUENCY,
+                        V4L2_CID_POWER_LINE_FREQUENCY_60HZ, 0,
+                        V4L2_CID_POWER_LINE_FREQUENCY_DISABLED);
+        ...
+        if (foo->ctrl_handler.error) {
+                int err = foo->ctrl_handler.error;
+                v4l2_ctrl_handler_free(&foo->ctrl_handler);
+                return err;
+        }
+The v4l2_ctrl_new_std function returns the v4l2_ctrl pointer to the new
+control, but if you do not need to access the pointer outside the control ops,
+then there is no need to store it.
+The v4l2_ctrl_new_std function will fill in most fields based on the control
+ID except for the min, max, step and default values. These are passed in the
+last four arguments. These values are driver specific while control attributes
+like type, name, flags are all global. The control's current value will be set
+to the default value.
+The v4l2_ctrl_new_std_menu function is very similar but it is used for menu
+controls. There is no min argument since that is always 0 for menu controls,
+and instead of a step there is a skip_mask argument: if bit X is 1, then menu
+item X is skipped.
+Note that if something fails, the function will return NULL or an error and
+set ctrl_handler->error to the error code. If ctrl_handler->error was already
+set, then it will just return and do nothing. This is also true for
+v4l2_ctrl_handler_init if it cannot allocate the internal data structure.
+This makes it easy to init the handler and just add all controls and only check
+the error code at the end. Saves a lot of repetitive error checking.
+It is recommended to add controls in ascending control ID order: it will be
+a bit faster that way.
+3) Optionally force initial control setup:
+        v4l2_ctrl_handler_setup(&foo->ctrl_handler);
+This will call s_ctrl for all controls unconditionally. Effectively this
+initializes the hardware to the default control values. It is recommended
+that you do this as this ensures that both the internal data structures and
+the hardware are in sync.
+4) Finally: implement the v4l2_ctrl_ops
+        static const struct v4l2_ctrl_ops foo_ctrl_ops = {
+                .s_ctrl = foo_s_ctrl,
+        };
+Usually all you need is s_ctrl:
+        static int foo_s_ctrl(struct v4l2_ctrl *ctrl)
+        {
+                struct foo *state = container_of(ctrl->handler, struct foo, ctrl_handler);
+                switch (ctrl->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        write_reg(0x123, ctrl->val);
+                        break;
+                case V4L2_CID_CONTRAST:
+                        write_reg(0x456, ctrl->val);
+                        break;
+                }
+                return 0;
+        }
+The control ops are called with the v4l2_ctrl pointer as argument.
+The new control value has already been validated, so all you need to do is
+to actually update the hardware registers.
+You're done! And this is sufficient for most of the drivers we have. No need
+to do any validation of control values, or implement QUERYCTRL/QUERYMENU. And
+G/S_CTRL as well as G/TRY/S_EXT_CTRLS are automatically supported.
+==============================================================================
+The remainder of this document deals with more advanced topics and scenarios.
+In practice the basic usage as described above is sufficient for most drivers.
+===============================================================================
+Inheriting Controls
+===================
+When a sub-device is registered with a V4L2 driver by calling
+v4l2_device_register_subdev() and the ctrl_handler fields of both v4l2_subdev
+and v4l2_device are set, then the controls of the subdev will become
+automatically available in the V4L2 driver as well. If the subdev driver
+contains controls that already exist in the V4L2 driver, then those will be
+skipped (so a V4L2 driver can always override a subdev control).
+What happens here is that v4l2_device_register_subdev() calls
+v4l2_ctrl_add_handler() adding the controls of the subdev to the controls
+of v4l2_device.
+Accessing Control Values
+========================
+The v4l2_ctrl struct contains these two unions:
+        /* The current control value. */
+        union {
+                s32 val;
+                s64 val64;
+                char *string;
+        } cur;
+        /* The new control value. */
+        union {
+                s32 val;
+                s64 val64;
+                char *string;
+        };
+Within the control ops you can freely use these. The val and val64 speak for
+themselves. The string pointers point to character buffers of length
+ctrl->maximum + 1, and are always 0-terminated.
+In most cases 'cur' contains the current cached control value. When you create
+a new control this value is made identical to the default value. After calling
+v4l2_ctrl_handler_setup() this value is passed to the hardware. It is generally
+a good idea to call this function.
+Whenever a new value is set that new value is automatically cached. This means
+that most drivers do not need to implement the g_volatile_ctrl() op. The
+exception is for controls that return a volatile register such as a signal
+strength read-out that changes continuously. In that case you will need to
+implement g_volatile_ctrl like this:
+        static int foo_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+        {
+                switch (ctrl->id) {
+                case V4L2_CID_BRIGHTNESS:
+                        ctrl->cur.val = read_reg(0x123);
+                        break;
+                }
+        }
+The 'new value' union is not used in g_volatile_ctrl. In general controls
+that need to implement g_volatile_ctrl are read-only controls.
+To mark a control as volatile you have to set the is_volatile flag:
+        ctrl = v4l2_ctrl_new_std(&sd->ctrl_handler, ...);
+        if (ctrl)
+                ctrl->is_volatile = 1;
+For try/s_ctrl the new values (i.e. as passed by the user) are filled in and
+you can modify them in try_ctrl or set them in s_ctrl. The 'cur' union
+contains the current value, which you can use (but not change!) as well.
+If s_ctrl returns 0 (OK), then the control framework will copy the new final
+values to the 'cur' union.
+While in g_volatile/s/try_ctrl you can access the value of all controls owned
+by the same handler since the handler's lock is held. If you need to access
+the value of controls owned by other handlers, then you have to be very careful
+not to introduce deadlocks.
+Outside of the control ops you have to go through to helper functions to get
+or set a single control value safely in your driver:
+        s32 v4l2_ctrl_g_ctrl(struct v4l2_ctrl *ctrl);
+        int v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val);
+These functions go through the control framework just as VIDIOC_G/S_CTRL ioctls
+do. Don't use these inside the control ops g_volatile/s/try_ctrl, though, that
+will result in a deadlock since these helpers lock the handler as well.
+You can also take the handler lock yourself:
+        mutex_lock(&state->ctrl_handler.lock);
+        printk(KERN_INFO "String value is '%s'\n", ctrl1->cur.string);
+        printk(KERN_INFO "Integer value is '%s'\n", ctrl2->cur.val);
+        mutex_unlock(&state->ctrl_handler.lock);
+Menu Controls
+=============
+The v4l2_ctrl struct contains this union:
+        union {
+                u32 step;
+                u32 menu_skip_mask;
+        };
+For menu controls menu_skip_mask is used. What it does is that it allows you
+to easily exclude certain menu items. This is used in the VIDIOC_QUERYMENU
+implementation where you can return -EINVAL if a certain menu item is not
+present. Note that VIDIOC_QUERYCTRL always returns a step value of 1 for
+menu controls.
+A good example is the MPEG Audio Layer II Bitrate menu control where the
+menu is a list of standardized possible bitrates. But in practice hardware
+implementations will only support a subset of those. By setting the skip
+mask you can tell the framework which menu items should be skipped. Setting
+it to 0 means that all menu items are supported.
+You set this mask either through the v4l2_ctrl_config struct for a custom
+control, or by calling v4l2_ctrl_new_std_menu().
+Custom Controls
+===============
+Driver specific controls can be created using v4l2_ctrl_new_custom():
+        static const struct v4l2_ctrl_config ctrl_filter = {
+                .ops = &ctrl_custom_ops,
+                .id = V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER,
+                .name = "Spatial Filter",
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .flags = V4L2_CTRL_FLAG_SLIDER,
+                .max = 15,
+                .step = 1,
+        };
+        ctrl = v4l2_ctrl_new_custom(&foo->ctrl_handler, &ctrl_filter, NULL);
+The last argument is the priv pointer which can be set to driver-specific
+private data.
+The v4l2_ctrl_config struct also has fields to set the is_private and is_volatile
+flags.
+If the name field is not set, then the framework will assume this is a standard
+control and will fill in the name, type and flags fields accordingly.
+Active and Grabbed Controls
+===========================
+If you get more complex relationships between controls, then you may have to
+activate and deactivate controls. For example, if the Chroma AGC control is
+on, then the Chroma Gain control is inactive. That is, you may set it, but
+the value will not be used by the hardware as long as the automatic gain
+control is on. Typically user interfaces can disable such input fields.
+You can set the 'active' status using v4l2_ctrl_activate(). By default all
+controls are active. Note that the framework does not check for this flag.
+It is meant purely for GUIs. The function is typically called from within
+s_ctrl.
+The other flag is the 'grabbed' flag. A grabbed control means that you cannot
+change it because it is in use by some resource. Typical examples are MPEG
+bitrate controls that cannot be changed while capturing is in progress.
+If a control is set to 'grabbed' using v4l2_ctrl_grab(), then the framework
+will return -EBUSY if an attempt is made to set this control. The
+v4l2_ctrl_grab() function is typically called from the driver when it
+starts or stops streaming.
+Control Clusters
+================
+By default all controls are independent from the others. But in more
+complex scenarios you can get dependencies from one control to another.
+In that case you need to 'cluster' them:
+        struct foo {
+                struct v4l2_ctrl_handler ctrl_handler;
+#define AUDIO_CL_VOLUME (0)
+#define AUDIO_CL_MUTE   (1)
+                struct v4l2_ctrl *audio_cluster[2];
+                ...
+        };
+        state->audio_cluster[AUDIO_CL_VOLUME] =
+                v4l2_ctrl_new_std(&state->ctrl_handler, ...);
+        state->audio_cluster[AUDIO_CL_MUTE] =
+                v4l2_ctrl_new_std(&state->ctrl_handler, ...);
+        v4l2_ctrl_cluster(ARRAY_SIZE(state->audio_cluster), state->audio_cluster);
+From now on whenever one or more of the controls belonging to the same
+cluster is set (or 'gotten', or 'tried'), only the control ops of the first
+control ('volume' in this example) is called. You effectively create a new
+composite control. Similar to how a 'struct' works in C.
+So when s_ctrl is called with V4L2_CID_AUDIO_VOLUME as argument, you should set
+all two controls belonging to the audio_cluster:
+        static int foo_s_ctrl(struct v4l2_ctrl *ctrl)
+        {
+                struct foo *state = container_of(ctrl->handler, struct foo, ctrl_handler);
+                switch (ctrl->id) {
+                case V4L2_CID_AUDIO_VOLUME: {
+                        struct v4l2_ctrl *mute = ctrl->cluster[AUDIO_CL_MUTE];
+                        write_reg(0x123, mute->val ? 0 : ctrl->val);
+                        break;
+                }
+                case V4L2_CID_CONTRAST:
+                        write_reg(0x456, ctrl->val);
+                        break;
+                }
+                return 0;
+        }
+In the example above the following are equivalent for the VOLUME case:
+        ctrl == ctrl->cluster[AUDIO_CL_VOLUME] == state->audio_cluster[AUDIO_CL_VOLUME]
+        ctrl->cluster[AUDIO_CL_MUTE] == state->audio_cluster[AUDIO_CL_MUTE]
+Note that controls in a cluster may be NULL. For example, if for some
+reason mute was never added (because the hardware doesn't support that
+particular feature), then mute will be NULL. So in that case we have a
+cluster of 2 controls, of which only 1 is actually instantiated. The
+only restriction is that the first control of the cluster must always be
+present, since that is the 'master' control of the cluster. The master
+control is the one that identifies the cluster and that provides the
+pointer to the v4l2_ctrl_ops struct that is used for that cluster.
+Obviously, all controls in the cluster array must be initialized to either
+a valid control or to NULL.
+VIDIOC_LOG_STATUS Support
+=========================
+This ioctl allow you to dump the current status of a driver to the kernel log.
+The v4l2_ctrl_handler_log_status(ctrl_handler, prefix) can be used to dump the
+value of the controls owned by the given handler to the log. You can supply a
+prefix as well. If the prefix didn't end with a space, then ': ' will be added
+for you.
+Different Handlers for Different Video Nodes
+============================================
+Usually the V4L2 driver has just one control handler that is global for
+all video nodes. But you can also specify different control handlers for
+different video nodes. You can do that by manually setting the ctrl_handler
+field of struct video_device.
+That is no problem if there are no subdevs involved but if there are, then
+you need to block the automatic merging of subdev controls to the global
+control handler. You do that by simply setting the ctrl_handler field in
+struct v4l2_device to NULL. Now v4l2_device_register_subdev() will no longer
+merge subdev controls.
+After each subdev was added, you will then have to call v4l2_ctrl_add_handler
+manually to add the subdev's control handler (sd->ctrl_handler) to the desired
+control handler. This control handler may be specific to the video_device or
+for a subset of video_device's. For example: the radio device nodes only have
+audio controls, while the video and vbi device nodes share the same control
+handler for the audio and video controls.
+If you want to have one handler (e.g. for a radio device node) have a subset
+of another handler (e.g. for a video device node), then you should first add
+the controls to the first handler, add the other controls to the second
+handler and finally add the first handler to the second. For example:
+        v4l2_ctrl_new_std(&radio_ctrl_handler, &radio_ops, V4L2_CID_AUDIO_VOLUME, ...);
+        v4l2_ctrl_new_std(&radio_ctrl_handler, &radio_ops, V4L2_CID_AUDIO_MUTE, ...);
+        v4l2_ctrl_new_std(&video_ctrl_handler, &video_ops, V4L2_CID_BRIGHTNESS, ...);
+        v4l2_ctrl_new_std(&video_ctrl_handler, &video_ops, V4L2_CID_CONTRAST, ...);
+        v4l2_ctrl_add_handler(&video_ctrl_handler, &radio_ctrl_handler);
+Or you can add specific controls to a handler:
+        volume = v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_AUDIO_VOLUME, ...);
+        v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_BRIGHTNESS, ...);
+        v4l2_ctrl_new_std(&video_ctrl_handler, &ops, V4L2_CID_CONTRAST, ...);
+        v4l2_ctrl_add_ctrl(&radio_ctrl_handler, volume);
+What you should not do is make two identical controls for two handlers.
+For example:
+        v4l2_ctrl_new_std(&radio_ctrl_handler, &radio_ops, V4L2_CID_AUDIO_MUTE, ...);
+        v4l2_ctrl_new_std(&video_ctrl_handler, &video_ops, V4L2_CID_AUDIO_MUTE, ...);
+This would be bad since muting the radio would not change the video mute
+control. The rule is to have one control for each hardware 'knob' that you
+can twiddle.
+Finding Controls
+================
+Normally you have created the controls yourself and you can store the struct
+v4l2_ctrl pointer into your own struct.
+But sometimes you need to find a control from another handler that you do
+not own. For example, if you have to find a volume control from a subdev.
+You can do that by calling v4l2_ctrl_find:
+        struct v4l2_ctrl *volume;
+        volume = v4l2_ctrl_find(sd->ctrl_handler, V4L2_CID_AUDIO_VOLUME);
+Since v4l2_ctrl_find will lock the handler you have to be careful where you
+use it. For example, this is not a good idea:
+        struct v4l2_ctrl_handler ctrl_handler;
+        v4l2_ctrl_new_std(&ctrl_handler, &video_ops, V4L2_CID_BRIGHTNESS, ...);
+        v4l2_ctrl_new_std(&ctrl_handler, &video_ops, V4L2_CID_CONTRAST, ...);
+...and in video_ops.s_ctrl:
+        case V4L2_CID_BRIGHTNESS:
+                contrast = v4l2_find_ctrl(&ctrl_handler, V4L2_CID_CONTRAST);
+                ...
+When s_ctrl is called by the framework the ctrl_handler.lock is already taken, so
+attempting to find another control from the same handler will deadlock.
+It is recommended not to use this function from inside the control ops.
+Inheriting Controls
+===================
+When one control handler is added to another using v4l2_ctrl_add_handler, then
+by default all controls from one are merged to the other. But a subdev might
+have low-level controls that make sense for some advanced embedded system, but
+not when it is used in consumer-level hardware. In that case you want to keep
+those low-level controls local to the subdev. You can do this by simply
+setting the 'is_private' flag of the control to 1:
+        static const struct v4l2_ctrl_config ctrl_private = {
+                .ops = &ctrl_custom_ops,
+                .id = V4L2_CID_...,
+                .name = "Some Private Control",
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .max = 15,
+                .step = 1,
+                .is_private = 1,
+        };
+        ctrl = v4l2_ctrl_new_custom(&foo->ctrl_handler, &ctrl_private, NULL);
+These controls will now be skipped when v4l2_ctrl_add_handler is called.
+V4L2_CTRL_TYPE_CTRL_CLASS Controls
+==================================
+Controls of this type can be used by GUIs to get the name of the control class.
+A fully featured GUI can make a dialog with multiple tabs with each tab
+containing the controls belonging to a particular control class. The name of
+each tab can be found by querying a special control with ID <control class | 1>.
+Drivers do not have to care about this. The framework will automatically add
+a control of this type whenever the first control belonging to a new control
+class is added.
+Differences from the Spec
+=========================
+There are a few places where the framework acts slightly differently from the
+V4L2 Specification. Those differences are described in this section. We will
+have to see whether we need to adjust the spec or not.
+1) It is no longer required to have all controls contained in a
+v4l2_ext_control array be from the same control class. The framework will be
+able to handle any type of control in the array. You need to set ctrl_class
+to 0 in order to enable this. If ctrl_class is non-zero, then it will still
+check that all controls belong to that control class.
+If you set ctrl_class to 0 and count to 0, then it will only return an error
+if there are no controls at all.
+2) Clarified the way error_idx works. For get and set it will be equal to
+count if nothing was done yet. If it is less than count then only the controls
+up to error_idx-1 were successfully applied.
+3) When attempting to read a button control the framework will return -EACCES
+instead of -EINVAL as stated in the spec. It seems to make more sense since
+button controls are write-only controls.
+4) Attempting to write to a read-only control will return -EACCES instead of
+-EINVAL as the spec says.
+5) The spec does not mention what should happen when you try to set/get a
+control class controls. ivtv currently returns -EINVAL (indicating that the
+control ID does not exist) while the framework will return -EACCES, which
+makes more sense.
+Proposals for Extensions
+========================
+Some ideas for future extensions to the spec:
+1) Add a V4L2_CTRL_FLAG_HEX to have values shown as hexadecimal instead of
+decimal. Useful for e.g. video_mute_yuv.
+2) It is possible to mark in the controls array which controls have been
+successfully written and which failed by for example adding a bit to the
+control ID. Not sure if it is worth the effort, though.
+3) Trying to set volatile inactive controls should result in -EACCESS.
+4) Add a new flag to mark volatile controls. Any application that wants
+to store the state of the controls can then skip volatile inactive controls.
+Currently it is not possible to detect such controls.
diff --git a/Documentation/video4linux/w9966.txt b/Documentation/video4linux/w9966.txt
index 78a651254b84..855024525fd2 100644
--- a/Documentation/video4linux/w9966.txt
+++ b/Documentation/video4linux/w9966.txt
@@ -24,7 +24,7 @@ where every two pixels take 4 bytes. In SDL (www.libsdl.org) this format
 is called VIDEO_PALETTE_YUV422 (16 bpp).
 A minimal test application (with source) is available from:
-  http://hem.fyristorg.com/mogul/w9966.html
+  http://www.slackwaresupport.com/howtos/Webcam-HOWTO
 The slow framerate is due to missing DMA ECP read support in the
 parport drivers. I might add working EPP support later.
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c
index 66e9358e2144..ccd951fa94ee 100644
--- a/Documentation/vm/page-types.c
+++ b/Documentation/vm/page-types.c
@@ -694,7 +694,7 @@ static void usage(void)
 #endif
 "            -l|--list                  Show page details in ranges\n"
 "            -L|--list-each             Show page details one by one\n"
-"            -N|--no-summary            Don't show summay info\n"
+"            -N|--no-summary            Don't show summary info\n"
 "            -X|--hwpoison              hwpoison pages\n"
 "            -x|--unpoison              unpoison pages\n"
 "            -h|--help                  Show this usage message\n"
diff --git a/Documentation/w1/masters/ds2482 b/Documentation/w1/masters/ds2482
index 299b91c7609f..56f8edace6ac 100644
--- a/Documentation/w1/masters/ds2482
+++ b/Documentation/w1/masters/ds2482
@@ -6,8 +6,8 @@ Supported chips:
    Prefix: 'ds2482'
    Addresses scanned: None
    Datasheets:
-        http://pdfserv.maxim-ic.com/en/ds/DS2482-100-DS2482S-100.pdf
+        http://datasheets.maxim-ic.com/en/ds/DS2482-100.pdf
-        http://pdfserv.maxim-ic.com/en/ds/DS2482-800-DS2482S-800.pdf
+        http://datasheets.maxim-ic.com/en/ds/DS2482-800.pdf
 Author: Ben Gardner <bgardner@wabtec.com>
diff --git a/Documentation/w1/masters/mxc-w1 b/Documentation/w1/masters/mxc-w1
index 97f6199a7f39..38be1ad65532 100644
--- a/Documentation/w1/masters/mxc-w1
+++ b/Documentation/w1/masters/mxc-w1
@@ -5,7 +5,8 @@ Supported chips:
  * Freescale MX27, MX31 and probably other i.MX SoCs
    Datasheets:
        http://www.freescale.com/files/32bit/doc/data_sheet/MCIMX31.pdf?fpsp=1
-        http://www.freescale.com/files/dsp/MCIMX27.pdf?fpsp=1
+        http://cache.freescale.com/files/dsp/doc/archive/MCIMX27.pdf?fsrch=1&WT_TYPE=
+        Data%20Sheets&WT_VENDOR=FREESCALE&WT_FILE_FORMAT=pdf&WT_ASSET=Documentation
 Author: Originally based on Freescale code, prepared for mainline by
        Sascha Hauer <s.hauer@pengutronix.de>
diff --git a/Documentation/w1/masters/omap-hdq b/Documentation/w1/masters/omap-hdq
index ca722e09b6a1..884dc284b215 100644
--- a/Documentation/w1/masters/omap-hdq
+++ b/Documentation/w1/masters/omap-hdq
@@ -7,7 +7,7 @@ Supported chips:
 A useful link about HDQ basics:
 ===============================
-http://focus.ti.com/lit/an/slua408/slua408.pdf
+http://focus.ti.com/lit/an/slua408a/slua408a.pdf
 Description:
 ============
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
index feb37e177010..cf5437deda81 100644
--- a/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
@@ -18,6 +18,7 @@ Offset	Proto	Name		Meaning
 080/010 ALL     hd0_info        hd0 disk parameter, OBSOLETE!!
 090/010 ALL     hd1_info        hd1 disk parameter, OBSOLETE!!
 0A0/010 ALL     sys_desc_table  System description table (struct sys_desc_table)
+0B0/010 ALL     olpc_ofw_header OLPC's OpenFirmware CIF and friends
 140/080 ALL     edid_info       Video mode setup (struct edid_info)
 1C0/020 ALL     efi_info        EFI 32 information (struct efi_info)
 1E0/004 ALL     alk_mem_k       Alternative mem check, in KB
diff --git a/Documentation/zh_CN/HOWTO b/Documentation/zh_CN/HOWTO
index 3d80e8af36ec..69160779e432 100644
--- a/Documentation/zh_CN/HOWTO
+++ b/Documentation/zh_CN/HOWTO
@@ -112,7 +112,7 @@ Linux内核代码中包含有大量的文档。这些文档对于学习如何与
    其他关于如何正确地生成补丁的优秀文档包括：
    "The Perfect Patch"
-        http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+        http://userweb.kernel.org/~akpm/stuff/tpp.txt
    "Linux kernel patch submission format"
        http://linux.yyz.us/patch-format.html
@@ -168,7 +168,7 @@ Linux内核代码中包含有大量的文档。这些文档对于学习如何与
 如果你想加入内核开发社区并协助完成一些任务，却找不到从哪里开始，可以访问
 “Linux内核房管员”计划：
-        http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors
 这是极佳的起点。它提供一个相对简单的任务列表，列出内核代码中需要被重新
 整理或者改正的地方。通过和负责这个计划的开发者们一同工作，你会学到将补丁
 集成进内核的基本原理。如果还没有决定下一步要做什么的话，你还可能会得到方
@@ -515,7 +515,7 @@ Linux内核社区并不喜欢一下接收大段的代码。修改需要被恰当
 想了解它具体应该看起来像什么，请查阅以下文档中的“ChangeLog”章节：
  “The Perfect Patch”
-      http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt
+         http://userweb.kernel.org/~akpm/stuff/tpp.txt
 这些事情有时候做起来很难。要在任何方面都做到完美可能需要好几年时间。这是
@@ -525,7 +525,7 @@ Linux内核社区并不喜欢一下接收大段的代码。修改需要被恰当
 ---------------
 感谢Paolo Ciarrocchi允许“开发流程”部分基于他所写的文章
-(http://linux.tar.bz/articles/2.6-development_process)，感谢Randy
+(http://www.kerneltravel.net/newbie/2.6-development_process)，感谢Randy
 Dunlap和Gerrit Huizenga完善了应该说和不该说的列表。感谢Pat Mochel, Hanna
 Linder, Randy Dunlap, Kay Sievers, Vojtech Pavlik, Jan Kara, Josh Boyer,
 Kees Cook, Andrew Morton, Andi Kleen, Vadim Lobanov, Jesper Juhl, Adrian
diff --git a/Documentation/zh_CN/SubmittingDrivers b/Documentation/zh_CN/SubmittingDrivers
index 5f4815c63ec7..c27b0f6cdd39 100644
--- a/Documentation/zh_CN/SubmittingDrivers
+++ b/Documentation/zh_CN/SubmittingDrivers
@@ -165,4 +165,4 @@ Linux USB项目：
        http://www.fenrus.org/how-to-not-write-a-device-driver-paper.pdf
 内核清洁工 (Kernel Janitor):
-        http://janitor.kernelnewbies.org/
+        http://kernelnewbies.org/KernelJanitors
diff --git a/Documentation/zh_CN/SubmittingPatches b/Documentation/zh_CN/SubmittingPatches
index 985c92e20b73..9a1a6e1ed09e 100644
--- a/Documentation/zh_CN/SubmittingPatches
+++ b/Documentation/zh_CN/SubmittingPatches
@@ -83,7 +83,7 @@ Quilt:
 http://savannah.nongnu.org/projects/quilt
 Andrew Morton 的补丁脚本:
-http://www.zip.com.au/~akpm/linux/patches/
+http://userweb.kernel.org/~akpm/stuff/patch-scripts.tar.gz
 作为这些脚本的替代，quilt 是值得推荐的补丁管理工具(看上面的链接)。
 2)描述你的改动。
@@ -166,7 +166,7 @@ MAITAINERS 文件里的）发送一个手册页（man-pages）补丁，或者至
  人拷贝，只要它是琐碎的）
  任何文件的作者/维护者对该文件的改动（例如 patch monkey 在重传模式下）
-URL: <http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/>
+EMAIL: trivial@kernel.org
 (译注，关于“琐碎补丁”的一些说明：因为原文的这一部分写得比较简单，所以不得不
 违例写一下译注。"trivial"这个英文单词的本意是“琐碎的，不重要的。”但是在这里
@@ -394,7 +394,7 @@ Static inline 函数相比宏来说，是好得多的选择。Static inline 函�
 ----------------
 Andrew Morton, "The perfect patch" (tpp).
-  <http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt>
+  <http://userweb.kernel.org/~akpm/stuff/tpp.txt>
 Jeff Garzik, "Linux kernel patch submission format".
  <http://linux.yyz.us/patch-format.html>
diff --git a/Documentation/zh_CN/sparse.txt b/Documentation/zh_CN/sparse.txt
index 75992a603ae3..cc144e581515 100644
--- a/Documentation/zh_CN/sparse.txt
+++ b/Documentation/zh_CN/sparse.txt
@@ -22,7 +22,7 @@ Documentation/sparse.txt 的中文翻译
 ---------------------------------------------------------------------
 Copyright 2004 Linus Torvalds
-Copyright 2004 Pavel Machek <pavel@suse.cz>
+Copyright 2004 Pavel Machek <pavel@ucw.cz>
 Copyright 2006 Bob Copeland <me@bobcopeland.com>
 使用 sparse 工具做类型检查