Merge tty-next into 3.6-rc1

This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
author: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-08-06 12:48:31 -0400
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2012-08-06 12:48:31 -0400
commit: c87985a3ce723995fc7b25e598238d67154108a1 (patch)
tree: e60def1b77c25c1d74180f62e8a5603f9826f209 /Documentation
parent: d155255a344c417acad74156654295a2964e6b81 (diff)
parent: 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
231 files changed, 6099 insertions, 1049 deletions
diff --git a/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads b/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
new file mode 100644
index 000000000000..b0b0eeb20fe3
--- /dev/null
+++ b/Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads
@@ -0,0 +1,5 @@
+What:           /proc/sys/vm/nr_pdflush_threads
+Date:           June 2012
+Contact:        Wanpeng Li <liwp@linux.vnet.ibm.com>
+Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
+             exported in /proc/sys/vm/ should be removed.
diff --git a/Documentation/ABI/stable/sysfs-bus-firewire b/Documentation/ABI/stable/sysfs-bus-firewire
index 3d484e5dc846..41e5a0cd1e3e 100644
--- a/Documentation/ABI/stable/sysfs-bus-firewire
+++ b/Documentation/ABI/stable/sysfs-bus-firewire
@@ -39,6 +39,17 @@ Users:		udev rules to set ownership and access permissions or ACLs of
                /dev/fw[0-9]+ character device files
+What:           /sys/bus/firewire/devices/fw[0-9]+/is_local
+Date:           July 2012
+KernelVersion:  3.6
+Contact:        linux1394-devel@lists.sourceforge.net
+Description:
+                IEEE 1394 node device attribute.
+                Read-only and immutable.
+Values:         1: The sysfs entry represents a local node (a controller card).
+                0: The sysfs entry represents a remote node.
 What:           /sys/bus/firewire/devices/fw[0-9]+[.][0-9]+/
 Date:           May 2007
 KernelVersion:  2.6.22
diff --git a/Documentation/ABI/stable/sysfs-driver-w1_ds28e04 b/Documentation/ABI/stable/sysfs-driver-w1_ds28e04
new file mode 100644
index 000000000000..26579ee868c9
--- /dev/null
+++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28e04
@@ -0,0 +1,15 @@
+What:           /sys/bus/w1/devices/.../pio
+Date:           May 2012
+Contact:        Markus Franke <franm@hrz.tu-chemnitz.de>
+Description:    read/write the contents of the two PIO's of the DS28E04-100
+                see Documentation/w1/slaves/w1_ds28e04 for detailed information
+Users:          any user space application which wants to communicate with DS28E04-100
+What:           /sys/bus/w1/devices/.../eeprom
+Date:           May 2012
+Contact:        Markus Franke <franm@hrz.tu-chemnitz.de>
+Description:    read/write the contents of the EEPROM memory of the DS28E04-100
+                see Documentation/w1/slaves/w1_ds28e04 for detailed information
+Users:          any user space application which wants to communicate with DS28E04-100
diff --git a/Documentation/ABI/stable/vdso b/Documentation/ABI/stable/vdso
index 8a1cbb594497..7cdfc28cc2c6 100644
--- a/Documentation/ABI/stable/vdso
+++ b/Documentation/ABI/stable/vdso
@@ -24,4 +24,4 @@ though.
 (As of this writing, this ABI documentation as been confirmed for x86_64.
 The maintainers of the other vDSO-using architectures should confirm
- that it is correct for their architecture.)
-\ No newline at end of file
+ that it is correct for their architecture.)
diff --git a/Documentation/ABI/testing/dev-kmsg b/Documentation/ABI/testing/dev-kmsg
index 281ecc5f9709..7e7e07a82e0e 100644
--- a/Documentation/ABI/testing/dev-kmsg
+++ b/Documentation/ABI/testing/dev-kmsg
@@ -58,16 +58,18 @@ Description:	The /dev/kmsg character device node provides userspace access
                The output format consists of a prefix carrying the syslog
                prefix including priority and facility, the 64 bit message
-                sequence number and the monotonic timestamp in microseconds.
+                sequence number and the monotonic timestamp in microseconds,
-                The values are separated by a ','. Future extensions might
+                and a flag field. All fields are separated by a ','.
-                add more comma separated values before the terminating ';'.
-                Unknown values should be gracefully ignored.
+                Future extensions might add more comma separated values before
+                the terminating ';'. Unknown fields and values should be
+                gracefully ignored.
                The human readable text string starts directly after the ';'
                and is terminated by a '\n'. Untrusted values derived from
                hardware or other facilities are printed, therefore
-                all non-printable characters in the log message are escaped
+                all non-printable characters and '\' itself in the log message
-                by "\x00" C-style hex encoding.
+                are escaped by "\x00" C-style hex encoding.
                A line starting with ' ', is a continuation line, adding
                key/value pairs to the log message, which provide the machine
@@ -75,11 +77,11 @@ Description:	The /dev/kmsg character device node provides userspace access
                userspace.
                Example:
-                7,160,424069;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
+                7,160,424069,-;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
                 SUBSYSTEM=acpi
                 DEVICE=+acpi:PNP0A03:00
-                6,339,5140900;NET: Registered protocol family 10
+                6,339,5140900,-;NET: Registered protocol family 10
-                30,340,5690716;udevd[80]: starting version 181
+                30,340,5690716,-;udevd[80]: starting version 181
                The DEVICE= key uniquely identifies devices the following way:
                  b12:8        - block dev_t
@@ -87,4 +89,13 @@ Description:	The /dev/kmsg character device node provides userspace access
                  n8           - netdev ifindex
                  +sound:card0 - subsystem:devname
+                The flags field carries '-' by default. A 'c' indicates a
+                fragment of a line. All following fragments are flagged with
+                '+'. Note, that these hints about continuation lines are not
+                neccessarily correct, and the stream could be interleaved with
+                unrelated messages, but merging the lines in the output
+                usually produces better human readable results. A similar
+                logic is used internally when messages are printed to the
+                console, /proc/kmsg or the syslog() syscall.
 Users:          dmesg(1), userspace kernel log consumers
diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram
index c8b3b48ec62c..ec93fe33baa6 100644
--- a/Documentation/ABI/testing/sysfs-block-zram
+++ b/Documentation/ABI/testing/sysfs-block-zram
@@ -96,4 +96,4 @@ Description:
                overhead, allocated for this disk. So, allocator space
                efficiency can be calculated using compr_data_size and this
                statistic.
-                Unit: bytes
-\ No newline at end of file
+                Unit: bytes
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index cfedf63cce15..2f06d40fe07d 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -40,9 +40,9 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                Some devices have internal clocks.  This parameter sets the
                resulting sampling frequency.  In many devices this
-                parameter has an effect on input filters etc rather than
+                parameter has an effect on input filters etc. rather than
                simply controlling when the input is sampled.  As this
-                effects datardy triggers, hardware buffers and the sysfs
+                effects data ready triggers, hardware buffers and the sysfs
                direct access interfaces, it may be found in any of the
                relevant directories.  If it effects all of the above
                then it is to be found in the base device directory.
@@ -74,7 +74,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Raw (unscaled no bias removal etc) voltage measurement from
+                Raw (unscaled no bias removal etc.) voltage measurement from
                channel Y. In special cases where the channel does not
                correspond to externally available input one of the named
                versions may be used. The number must always be specified and
@@ -118,11 +118,11 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_temp_z_raw
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Raw (unscaled no bias removal etc) temperature measurement.
+                Raw (unscaled no bias removal etc.) temperature measurement.
                If an axis is specified it generally means that the temperature
                sensor is associated with one part of a compound device (e.g.
                a gyroscope axis). Units after application of scale and offset
-                are milli degrees Celsuis.
+                are milli degrees Celsius.
 What:           /sys/bus/iio/devices/iio:deviceX/in_tempX_input
 KernelVersion:  2.6.38
@@ -148,10 +148,9 @@ KernelVersion:	2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
                Angular velocity about axis x, y or z (may be arbitrarily
-                assigned) Data converted by application of offset then scale to
+                assigned). Has all the equivalent parameters as per voltageY.
-                radians per second. Has all the equivalent parameters as
+                Units after application of scale and offset are radians per
-                per voltageY. Units after application of scale and offset are
+                second.
-                radians per second.
 What:           /sys/bus/iio/devices/iio:deviceX/in_incli_x_raw
 What:           /sys/bus/iio/devices/iio:deviceX/in_incli_y_raw
@@ -161,7 +160,7 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                Inclination raw reading about axis x, y or z (may be
                arbitrarily assigned). Data converted by application of offset
-                and scale to Degrees.
+                and scale to degrees.
 What:           /sys/bus/iio/devices/iio:deviceX/in_magn_x_raw
 What:           /sys/bus/iio/devices/iio:deviceX/in_magn_y_raw
@@ -203,7 +202,7 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                If known for a device, offset to be added to <type>[Y]_raw prior
                to scaling by <type>[Y]_scale in order to obtain value in the
-                <type> units as specified in <type>[y]_raw documentation.
+                <type> units as specified in <type>[Y]_raw documentation.
                Not present if the offset is always 0 or unknown. If Y or
                axis <x|y|z> is not present, then the offset applies to all
                in channels of <type>.
@@ -249,7 +248,7 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Hardware applied calibration offset. (assumed to fix production
+                Hardware applied calibration offset (assumed to fix production
                inaccuracies).
 What            /sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale
@@ -266,7 +265,7 @@ what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
 KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                Hardware applied calibration scale factor. (assumed to fix
+                Hardware applied calibration scale factor (assumed to fix
                production inaccuracies).  If shared across all channels,
                <type>_calibscale is used.
@@ -276,10 +275,10 @@ What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available
 What:           /sys/.../iio:deviceX/out_voltageX_scale_available
 What:           /sys/.../iio:deviceX/out_altvoltageX_scale_available
 What:           /sys/.../iio:deviceX/in_capacitance_scale_available
-KernelVersion:  2.635
+KernelVersion:  2.6.35
 Contact:        linux-iio@vger.kernel.org
 Description:
-                If a discrete set of scale values are available, they
+                If a discrete set of scale values is available, they
                are listed in this attribute.
 What            /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
@@ -330,9 +329,11 @@ Contact:	linux-iio@vger.kernel.org
 Description:
                Specifies the output powerdown mode.
                DAC output stage is disconnected from the amplifier and
-                1kohm_to_gnd: connected to ground via an 1kOhm resistor
+                1kohm_to_gnd: connected to ground via an 1kOhm resistor,
-                100kohm_to_gnd: connected to ground via an 100kOhm resistor
+                6kohm_to_gnd: connected to ground via a 6kOhm resistor,
-                three_state: left floating
+                20kohm_to_gnd: connected to ground via a 20kOhm resistor,
+                100kohm_to_gnd: connected to ground via an 100kOhm resistor,
+                three_state: left floating.
                For a list of available output power down options read
                outX_powerdown_mode_available. If Y is not present the
                mode is shared across all outputs.
@@ -355,9 +356,10 @@ KernelVersion:	2.6.38
 Contact:        linux-iio@vger.kernel.org
 Description:
                Writing 1 causes output Y to enter the power down mode specified
-                by the corresponding outY_powerdown_mode. Clearing returns to
+                by the corresponding outY_powerdown_mode. DAC output stage is
-                normal operation. Y may be suppressed if all outputs are
+                disconnected from the amplifier. Clearing returns to normal
-                controlled together.
+                operation. Y may be suppressed if all outputs are controlled
+                together.
 What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
 KernelVersion:  3.4.0
@@ -421,12 +423,12 @@ Description:
                different values, but the device can only enable both thresholds
                or neither.
                Note the driver will assume the last p events requested are
-                to be enabled where p is however many it supports (which may
+                to be enabled where p is how many it supports (which may vary
-                vary depending on the exact set requested. So if you want to be
+                depending on the exact set requested. So if you want to be
                sure you have set what you think you have, check the contents of
                these attributes after everything is configured. Drivers may
                have to buffer any parameters so that they are consistent when
-                a given event type is enabled a future point (and not those for
+                a given event type is enabled at a future point (and not those for
                whatever event was previously enabled).
 What:           /sys/.../iio:deviceX/events/in_accel_x_roc_rising_en
@@ -702,7 +704,7 @@ What:		/sys/.../buffer/scan_elements/in_anglvel_type
 What:           /sys/.../buffer/scan_elements/in_magn_type
 What:           /sys/.../buffer/scan_elements/in_incli_type
 What:           /sys/.../buffer/scan_elements/in_voltageY_type
-What:           /sys/.../buffer/scan_elements/in_voltage-in_type
+What:           /sys/.../buffer/scan_elements/in_voltage_type
 What:           /sys/.../buffer/scan_elements/in_voltageY_supply_type
 What:           /sys/.../buffer/scan_elements/in_timestamp_type
 KernelVersion:  2.6.37
@@ -723,7 +725,7 @@ Description:
                the buffer output value appropriately.  The storagebits value
                also specifies the data alignment.  So s48/64>>2 will be a
                signed 48 bit integer stored in a 64 bit location aligned to
-                a a64 bit boundary. To obtain the clean value, shift right 2
+                a 64 bit boundary. To obtain the clean value, shift right 2
                and apply a mask to zero the top 16 bits of the result.
                For other storage combinations this attribute will be extended
                appropriately.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523 b/Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
new file mode 100644
index 000000000000..2ce9c3f68eee
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523
@@ -0,0 +1,37 @@
+What:           /sys/bus/iio/devices/iio:deviceX/pll2_feedback_clk_present
+What:           /sys/bus/iio/devices/iio:deviceX/pll2_reference_clk_present
+What:           /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_a_present
+What:           /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_b_present
+What:           /sys/bus/iio/devices/iio:deviceX/pll1_reference_clk_test_present
+What:           /sys/bus/iio/devices/iio:deviceX/vcxo_clk_present
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Reading returns either '1' or '0'.
+                '1' means that the clock in question is present.
+                '0' means that the clock is missing.
+What:           /sys/bus/iio/devices/iio:deviceX/pllY_locked
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Reading returns either '1' or '0'. '1' means that the
+                pllY is locked.
+What:           /sys/bus/iio/devices/iio:deviceX/store_eeprom
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Writing '1' stores the current device configuration into
+                on-chip EEPROM. After power-up or chip reset the device will
+                automatically load the saved configuration.
+What:           /sys/bus/iio/devices/iio:deviceX/sync_dividers
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Writing '1' triggers the clock distribution synchronization
+                functionality. All dividers are reset and the channels start
+                with their predefined phase offsets (out_altvoltageY_phase).
+                Writing this file has the effect as driving the external
+                /SYNC pin low.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350 b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
new file mode 100644
index 000000000000..d89aded01c5a
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350
@@ -0,0 +1,21 @@
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency_resolution
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Stores channel Y frequency resolution/channel spacing in Hz.
+                The value given directly influences the MODULUS used by
+                the fractional-N PLL. It is assumed that the algorithm
+                that is used to compute the various dividers, is able to
+                generate proper values for multiples of channel spacing.
+What:           /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_refin_frequency
+KernelVersion:  3.4.0
+Contact:        linux-iio@vger.kernel.org
+Description:
+                Sets channel Y REFin frequency in Hz. In some clock chained
+                applications, the reference frequency used by the PLL may
+                change during runtime. This attribute allows the user to
+                adjust the reference frequency accordingly.
+                The value written has no effect until out_altvoltageY_frequency
+                is updated. Consider to use out_altvoltageY_powerdown to power
+                down the PLL and it's RFOut buffers during REFin changes.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-light-lm3533-als b/Documentation/ABI/testing/sysfs-bus-iio-light-lm3533-als
new file mode 100644
index 000000000000..22c5ea670971
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-light-lm3533-als
@@ -0,0 +1,61 @@
+What:           /sys/.../events/in_illuminance0_thresh_either_en
+Date:           April 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Event generated when channel passes one of the four thresholds
+                in each direction (rising|falling) and a zone change occurs.
+                The corresponding light zone can be read from
+                in_illuminance0_zone.
+What:           /sys/.../events/in_illuminance0_threshY_hysteresis
+Date:           May 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Get the hysteresis for thresholds Y, that is,
+                threshY_hysteresis = threshY_raising - threshY_falling
+What:           /sys/.../events/illuminance_threshY_falling_value
+What:           /sys/.../events/illuminance_threshY_raising_value
+Date:           April 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Specifies the value of threshold that the device is comparing
+                against for the events enabled by
+                in_illuminance0_thresh_either_en (0..255), where Y in 0..3.
+                Note that threshY_falling must be less than or equal to
+                threshY_raising.
+                These thresholds correspond to the eight zone-boundary
+                registers (boundaryY_{low,high}) and define the five light
+                zones.
+What:           /sys/bus/iio/devices/iio:deviceX/in_illuminance0_zone
+Date:           April 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Get the current light zone (0..4) as defined by the
+                in_illuminance0_threshY_{falling,rising} thresholds.
+What:           /sys/bus/iio/devices/iio:deviceX/out_currentY_raw
+Date:           May 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Get output current for channel Y (0..255), that is,
+                out_currentY_currentZ_raw, where Z is the current zone.
+What:           /sys/bus/iio/devices/iio:deviceX/out_currentY_currentZ_raw
+Date:           May 2012
+KernelVersion:  3.5
+Contact:        Johan Hovold <jhovold@gmail.com>
+Description:
+                Set the output current for channel out_currentY when in zone
+                Z (0..255), where Y in 0..2 and Z in 0..4.
+                These values correspond to the ALS-mapper target registers for
+                ALS-mapper Y + 1.
diff --git a/Documentation/ABI/testing/sysfs-bus-rbd b/Documentation/ABI/testing/sysfs-bus-rbd
index bcd88eb7ebcd..3c17b62899f6 100644
--- a/Documentation/ABI/testing/sysfs-bus-rbd
+++ b/Documentation/ABI/testing/sysfs-bus-rbd
@@ -35,8 +35,14 @@ name
 pool
-        The pool where this rbd image resides. The pool-name pair is unique
+        The name of the storage pool where this rbd image resides.
-        per rados system.
+        An rbd image name is unique within its pool.
+pool_id
+        The unique identifier for the rbd image's pool.  This is
+        a permanent attribute of the pool.  A pool's id will never
+        change.
 size
diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index 6df4e6f57560..5f75f8f7df34 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -208,3 +208,15 @@ Description:
                such as ACPI. This file will read either "removable" or
                "fixed" if the information is available, and "unknown"
                otherwise.
+What:           /sys/bus/usb/devices/.../ltm_capable
+Date:           July 2012
+Contact:        Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Description:
+                USB 3.0 devices may optionally support Latency Tolerance
+                Messaging (LTM).  They indicate their support by setting a bit
+                in the bmAttributes field of their SuperSpeed BOS descriptors.
+                If that bit is set for the device, ltm_capable will read "yes".
+                If the device doesn't support LTM, the file will read "no".
+                The file will be present for all speeds of USB devices, and will
+                always read "no" for USB 1.1 and USB 2.0 devices.
diff --git a/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg b/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg
index cb830df8777c..70d00dfa443d 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg
+++ b/Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg
@@ -40,4 +40,4 @@ Description:	Controls the decimal places on the device.
                the value of 10 ** n. Assume this field has
                the value k and has 1 or more decimal places set,
                to set the mth place (where m is not already set),
-                change this fields value to k + 10 ** m.
-\ No newline at end of file
+                change this fields value to k + 10 ** m.
diff --git a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
index 4a9c545bda4b..33e648808117 100644
--- a/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
+++ b/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870
@@ -53,4 +53,4 @@ Description:
                Documentation/ABI/stable/sysfs-class-backlight.
                It can be enabled by writing the value stored in
                /sys/class/backlight/<backlight>/max_brightness to
-                /sys/class/backlight/<backlight>/brightness.
-\ No newline at end of file
+                /sys/class/backlight/<backlight>/brightness.
diff --git a/Documentation/ABI/testing/sysfs-devices-edac b/Documentation/ABI/testing/sysfs-devices-edac
new file mode 100644
index 000000000000..30ee78aaed75
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-edac
@@ -0,0 +1,140 @@
+What:           /sys/devices/system/edac/mc/mc*/reset_counters
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This write-only control file will zero all the statistical
+                counters for UE and CE errors on the given memory controller.
+                Zeroing the counters will also reset the timer indicating how
+                long since the last counter were reset. This is useful for
+                computing errors/time.  Since the counters are always reset
+                at driver initialization time, no module/kernel parameter
+                is available.
+What:           /sys/devices/system/edac/mc/mc*/seconds_since_reset
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays how many seconds have elapsed
+                since the last counter reset. This can be used with the error
+                counters to measure error rates.
+What:           /sys/devices/system/edac/mc/mc*/mc_name
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays the type of memory controller
+                that is being utilized.
+What:           /sys/devices/system/edac/mc/mc*/size_mb
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays, in count of megabytes, of memory
+                that this memory controller manages.
+What:           /sys/devices/system/edac/mc/mc*/ue_count
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays the total count of uncorrectable
+                errors that have occurred on this memory controller. If
+                panic_on_ue is set, this counter will not have a chance to
+                increment, since EDAC will panic the system
+What:           /sys/devices/system/edac/mc/mc*/ue_noinfo_count
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays the number of UEs that have
+                occurred on this memory controller with no information as to
+                which DIMM slot is having errors.
+What:           /sys/devices/system/edac/mc/mc*/ce_count
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays the total count of correctable
+                errors that have occurred on this memory controller. This
+                count is very important to examine. CEs provide early
+                indications that a DIMM is beginning to fail. This count
+                field should be monitored for non-zero values and report
+                such information to the system administrator.
+What:           /sys/devices/system/edac/mc/mc*/ce_noinfo_count
+Date:           January 2006
+Contact:        linux-edac@vger.kernel.org
+Description:    This attribute file displays the number of CEs that
+                have occurred on this memory controller wherewith no
+                information as to which DIMM slot is having errors. Memory is
+                handicapped, but operational, yet no information is available
+                to indicate which slot the failing memory is in. This count
+                field should be also be monitored for non-zero values.
+What:           /sys/devices/system/edac/mc/mc*/sdram_scrub_rate
+Date:           February 2007
+Contact:        linux-edac@vger.kernel.org
+Description:    Read/Write attribute file that controls memory scrubbing.
+                The scrubbing rate used by the memory controller is set by
+                writing a minimum bandwidth in bytes/sec to the attribute file.
+                The rate will be translated to an internal value that gives at
+                least the specified rate.
+                Reading the file will return the actual scrubbing rate employed.
+                If configuration fails or memory scrubbing is not implemented,
+                the value of the attribute file will be -1.
+What:           /sys/devices/system/edac/mc/mc*/max_location
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file displays the information about the last
+                available memory slot in this memory controller. It is used by
+                userspace tools in order to display the memory filling layout.
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/size
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file will display the size of dimm or rank.
+                For dimm*/size, this is the size, in MB of the DIMM memory
+                stick. For rank*/size, this is the size, in MB for one rank
+                of the DIMM memory stick. On single rank memories (1R), this
+                is also the total size of the dimm. On dual rank (2R) memories,
+                this is half the size of the total DIMM memories.
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_dev_type
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file will display what type of DRAM device is
+                being utilized on this DIMM (x1, x2, x4, x8, ...).
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_edac_mode
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file will display what type of Error detection
+                and correction is being utilized. For example: S4ECD4ED would
+                mean a Chipkill with x4 DRAM.
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_label
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This control file allows this DIMM to have a label assigned
+                to it. With this label in the module, when errors occur
+                the output can provide the DIMM label in the system log.
+                This becomes vital for panic events to isolate the
+                cause of the UE event.
+                DIMM Labels must be assigned after booting, with information
+                that correctly identifies the physical slot with its
+                silk screen label. This information is currently very
+                motherboard specific and determination of this information
+                must occur in userland at this time.
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_location
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file will display the location (csrow/channel,
+                branch/channel/slot or channel/slot) of the dimm or rank.
+What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_mem_type
+Date:           April 2012
+Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+                linux-edac@vger.kernel.org
+Description:    This attribute file will display what type of memory is
+                currently on this csrow. Normally, either buffered or
+                unbuffered memory (for example, Unbuffered-DDR3).
diff --git a/Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb b/Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb
new file mode 100644
index 000000000000..2107082426da
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-platform-sh_mobile_lcdc_fb
@@ -0,0 +1,44 @@
+What:           /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_alpha
+Date:           May 2012
+Contact:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Description:
+                This file is only available on fb[0-9] devices corresponding
+                to overlay planes.
+                Stores the alpha blending value for the overlay. Values range
+                from 0 (transparent) to 255 (opaque). The value is ignored if
+                the mode is not set to Alpha Blending.
+What:           /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_mode
+Date:           May 2012
+Contact:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Description:
+                This file is only available on fb[0-9] devices corresponding
+                to overlay planes.
+                Selects the composition mode for the overlay. Possible values
+                are
+                0 - Alpha Blending
+                1 - ROP3
+What:           /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_position
+Date:           May 2012
+Contact:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Description:
+                This file is only available on fb[0-9] devices corresponding
+                to overlay planes.
+                Stores the x,y overlay position on the display in pixels. The
+                position format is `[0-9]+,[0-9]+'.
+What:           /sys/devices/platform/sh_mobile_lcdc_fb.[0-3]/graphics/fb[0-9]/ovl_rop3
+Date:           May 2012
+Contact:        Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Description:
+                This file is only available on fb[0-9] devices corresponding
+                to overlay planes.
+                Stores the raster operation (ROP3) for the overlay. Values
+                range from 0 to 255. The value is ignored if the mode is not
+                set to ROP3.
diff --git a/Documentation/ABI/testing/sysfs-devices-system-xen_cpu b/Documentation/ABI/testing/sysfs-devices-system-xen_cpu
new file mode 100644
index 000000000000..9ca02fb2d498
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-devices-system-xen_cpu
@@ -0,0 +1,20 @@
+What:           /sys/devices/system/xen_cpu/
+Date:           May 2012
+Contact:        Liu, Jinsong <jinsong.liu@intel.com>
+Description:
+                A collection of global/individual Xen physical cpu attributes
+                Individual physical cpu attributes are contained in
+                subdirectories named by the Xen's logical cpu number, e.g.:
+                /sys/devices/system/xen_cpu/xen_cpu#/
+What:           /sys/devices/system/xen_cpu/xen_cpu#/online
+Date:           May 2012
+Contact:        Liu, Jinsong <jinsong.liu@intel.com>
+Description:
+                Interface to online/offline Xen physical cpus
+                When running under Xen platform, it provide user interface
+                to online/offline physical cpus, except cpu0 due to several
+                logic restrictions and assumptions.
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd b/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd
new file mode 100644
index 000000000000..57b92cbdceae
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd
@@ -0,0 +1,38 @@
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_to_select
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This controls if mouse clicks should be generated if the trackpoint is quickly pressed. How fast this press has to be
+                is being controlled by press_speed.
+                Values are 0 or 1.
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/dragging
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    If this setting is enabled, it is possible to do dragging by pressing the trackpoint. This requires press_to_select to be enabled.
+                Values are 0 or 1.
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/release_to_select
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    For details regarding this setting please refer to http://www.pc.ibm.com/ww/healthycomputing/trkpntb.html
+                Values are 0 or 1.
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/select_right
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This setting controls if the mouse click events generated by pressing the trackpoint (if press_to_select is enabled) generate
+                a left or right mouse button click.
+                Values are 0 or 1.
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/sensitivity
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This file contains the trackpoint sensitivity.
+                Values are decimal integers from 1 (lowest sensitivity) to 255 (highest sensitivity).
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/press_speed
+Date:           July 2011
+Contact:        linux-input@vger.kernel.org
+Description:    This setting controls how fast the trackpoint needs to be pressed to generate a mouse click if press_to_select is enabled.
+                Values are decimal integers from 1 (slowest) to 255 (fastest).
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu b/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu
new file mode 100644
index 000000000000..b42922cf6b1f
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu
@@ -0,0 +1,77 @@
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/buttons
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    The mouse can store 5 profiles which can be switched by the
+                press of a button. A profile is split into general settings and
+                button settings. buttons holds informations about button layout.
+                When written, this file lets one write the respective profile
+                buttons to the mouse. The data has to be 47 bytes long.
+                The mouse will reject invalid data.
+                Which profile to write is determined by the profile number
+                contained in the data.
+                Before reading this file, control has to be written to select
+                which profile to read.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/control
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one select which data from which
+                profile will be read next. The data has to be 3 bytes long.
+                This file is writeonly.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/general
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    The mouse can store 5 profiles which can be switched by the
+                press of a button. A profile is split into general settings and
+                button settings. profile holds informations like resolution, sensitivity
+                and light effects.
+                When written, this file lets one write the respective profile
+                settings back to the mouse. The data has to be 43 bytes long.
+                The mouse will reject invalid data.
+                Which profile to write is determined by the profile number
+                contained in the data.
+                This file is writeonly.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/info
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When read, this file returns general data like firmware version.
+                The data is 8 bytes long.
+                This file is readonly.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/macro
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    When written, this file lets one store macros with max 500
+                keystrokes for a specific button for a specific profile.
+                Button and profile numbers are included in written data.
+                The data has to be 2083 bytes long.
+                Before reading this file, control has to be written to select
+                which profile and key to read.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/profile
+Date:           Mai 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    The mouse can store 5 profiles which can be switched by the
+                press of a button. profile holds number of actual profile.
+                This value is persistent, so its value determines the profile
+                that's active when the mouse is powered on next time.
+                When written, the mouse activates the set profile immediately.
+                The data has to be 3 bytes long.
+                The mouse will reject invalid data.
+Users:          http://roccat.sourceforge.net
+What:           /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/sensor
+Date:           July 2012
+Contact:        Stefan Achatz <erazor_de@users.sourceforge.net>
+Description:    The mouse has a Avago ADNS-3090 sensor.
+                This file allows reading and writing of the mouse sensors registers.
+                The data has to be 4 bytes long.
+Users:          http://roccat.sourceforge.net
diff --git a/Documentation/ABI/testing/sysfs-kernel-iommu_groups b/Documentation/ABI/testing/sysfs-kernel-iommu_groups
new file mode 100644
index 000000000000..9b31556cfdda
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-kernel-iommu_groups
@@ -0,0 +1,14 @@
+What:           /sys/kernel/iommu_groups/
+Date:           May 2012
+KernelVersion:  v3.5
+Contact:        Alex Williamson <alex.williamson@redhat.com>
+Description:    /sys/kernel/iommu_groups/ contains a number of sub-
+                directories, each representing an IOMMU group.  The
+                name of the sub-directory matches the iommu_group_id()
+                for the group, which is an integer value.  Within each
+                subdirectory is another directory named "devices" with
+                links to the sysfs devices contained in this group.
+                The group directory also optionally contains a "name"
+                file if the IOMMU driver has chosen to register a more
+                common name for the group.
+Users:
diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/ABI/testing/sysfs-platform-asus-wmi
index 2e7df91620de..019e1e29370e 100644
--- a/Documentation/ABI/testing/sysfs-platform-asus-wmi
+++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi
@@ -29,3 +29,10 @@ KernelVersion:	2.6.39
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                Control the card touchpad. 1 means on, 0 means off.
+What:           /sys/devices/platform/<platform>/lid_resume
+Date:           May 2012
+KernelVersion:  3.5
+Contact:        "AceLan Kao" <acelan.kao@canonical.com>
+Description:
+                Resume on lid open. 1 means on, 0 means off.
diff --git a/Documentation/ABI/testing/sysfs-power b/Documentation/ABI/testing/sysfs-power
index 31725ffeeb3a..217772615d02 100644
--- a/Documentation/ABI/testing/sysfs-power
+++ b/Documentation/ABI/testing/sysfs-power
@@ -231,3 +231,16 @@ Description:
                Reads from this file return a string consisting of the names of
                wakeup sources created with the help of /sys/power/wake_lock
                that are inactive at the moment, separated with spaces.
+What:           /sys/power/pm_print_times
+Date:           May 2012
+Contact:        Sameer Nanda <snanda@chromium.org>
+Description:
+                The /sys/power/pm_print_times file allows user space to
+                control whether the time taken by devices to suspend and
+                resume is printed.  These prints are useful for hunting down
+                devices that take too long to suspend or resume.
+                Writing a "1" enables this printing while writing a "0"
+                disables it.  The default value is "0".  Reading from this file
+                will display the current value.
diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt
index 5c72eed89563..f50309081ac7 100644
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
@@ -49,3 +49,45 @@ DMA_ATTR_NON_CONSISTENT lets the platform to choose to return either
 consistent or non-consistent memory as it sees fit.  By using this API,
 you are guaranteeing to the platform that you have all the correct and
 necessary sync points for this memory in the driver.
+DMA_ATTR_NO_KERNEL_MAPPING
+--------------------------
+DMA_ATTR_NO_KERNEL_MAPPING lets the platform to avoid creating a kernel
+virtual mapping for the allocated buffer. On some architectures creating
+such mapping is non-trivial task and consumes very limited resources
+(like kernel virtual address space or dma consistent address space).
+Buffers allocated with this attribute can be only passed to user space
+by calling dma_mmap_attrs(). By using this API, you are guaranteeing
+that you won't dereference the pointer returned by dma_alloc_attr(). You
+can threat it as a cookie that must be passed to dma_mmap_attrs() and
+dma_free_attrs(). Make sure that both of these also get this attribute
+set on each call.
+Since it is optional for platforms to implement
+DMA_ATTR_NO_KERNEL_MAPPING, those that do not will simply ignore the
+attribute and exhibit default behavior.
+DMA_ATTR_SKIP_CPU_SYNC
+----------------------
+By default dma_map_{single,page,sg} functions family transfer a given
+buffer from CPU domain to device domain. Some advanced use cases might
+require sharing a buffer between more than one device. This requires
+having a mapping created separately for each device and is usually
+performed by calling dma_map_{single,page,sg} function more than once
+for the given buffer with device pointer to each device taking part in
+the buffer sharing. The first call transfers a buffer from 'CPU' domain
+to 'device' domain, what synchronizes CPU caches for the given region
+(usually it means that the cache has been flushed or invalidated
+depending on the dma direction). However, next calls to
+dma_map_{single,page,sg}() for other devices will perform exactly the
+same sychronization operation on the CPU cache. CPU cache sychronization
+might be a time consuming operation, especially if the buffers are
+large, so it is highly recommended to avoid it if possible.
+DMA_ATTR_SKIP_CPU_SYNC allows platform code to skip synchronization of
+the CPU cache for the given buffer assuming that it has been already
+transferred to 'device' domain. This attribute can be also used for
+dma_unmap_{single,page,sg} functions family to force buffer to stay in
+device domain after releasing a mapping for it. Use this attribute with
+care!
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index f3e214f9e256..42e7f030cb16 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -404,7 +404,6 @@
 !Finclude/net/mac80211.h ieee80211_get_tkip_p1k
 !Finclude/net/mac80211.h ieee80211_get_tkip_p1k_iv
 !Finclude/net/mac80211.h ieee80211_get_tkip_p2k
-!Finclude/net/mac80211.h ieee80211_key_removed
      </chapter>
      <chapter id="powersave">
diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml
index 7c49facecd25..1078e45f189f 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -194,7 +194,7 @@ in the frequency range from 87,5 to 108,0 MHz</title>
        <corpauthor>National Radio Systems Committee
 (<ulink url="http://www.nrscstandards.org">http://www.nrscstandards.org</ulink>)</corpauthor>
      </authorgroup>
-      <title>NTSC-4: United States RBDS Standard</title>
+      <title>NRSC-4: United States RBDS Standard</title>
    </biblioentry>
    <biblioentry id="iso12232">
diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml
index 4101aeb56540..b91d25313b63 100644
--- a/Documentation/DocBook/media/v4l/common.xml
+++ b/Documentation/DocBook/media/v4l/common.xml
@@ -464,14 +464,14 @@ The <structfield>type</structfield> field of the respective
 <structfield>tuner</structfield> field contains the index number of
 the tuner.</para>
-      <para>Radio devices have exactly one tuner with index zero, no
+      <para>Radio input devices have exactly one tuner with index zero, no
 video inputs.</para>
      <para>To query and change tuner properties applications use the
 &VIDIOC-G-TUNER; and &VIDIOC-S-TUNER; ioctl, respectively. The
 &v4l2-tuner; returned by <constant>VIDIOC_G_TUNER</constant> also
 contains signal status information applicable when the tuner of the
-current video input, or a radio tuner is queried. Note that
+current video or radio input is queried. Note that
 <constant>VIDIOC_S_TUNER</constant> does not switch the current tuner,
 when there is more than one at all. The tuner is solely determined by
 the current video input. Drivers must support both ioctls and set the
@@ -491,8 +491,17 @@ the modulator. The <structfield>type</structfield> field of the
 respective &v4l2-output; returned by the &VIDIOC-ENUMOUTPUT; ioctl is
 set to <constant>V4L2_OUTPUT_TYPE_MODULATOR</constant> and its
 <structfield>modulator</structfield> field contains the index number
-of the modulator. This specification does not define radio output
+of the modulator.</para>
-devices.</para>
+      <para>Radio output devices have exactly one modulator with index
+zero, no video outputs.</para>
+      <para>A video or radio device cannot support both a tuner and a
+modulator. Two separate device nodes will have to be used for such
+hardware, one that supports the tuner functionality and one that supports
+the modulator functionality. The reason is a limitation with the
+&VIDIOC-S-FREQUENCY; ioctl where you cannot specify whether the frequency
+is for a tuner or a modulator.</para>
      <para>To query and change modulator properties applications use
 the &VIDIOC-G-MODULATOR; and &VIDIOC-S-MODULATOR; ioctl. Note that
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index ea42ef824948..faa0fd14666a 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2377,10 +2377,11 @@ that used it. It was originally scheduled for removal in 2.6.35.
          <para>V4L2_CTRL_FLAG_VOLATILE was added to signal volatile controls to userspace.</para>
        </listitem>
        <listitem>
-          <para>Add selection API for extended control over cropping and
+          <para>Add selection API for extended control over cropping
-composing. Does not affect the compatibility of current drivers and
+          and composing. Does not affect the compatibility of current
-applications.  See <link linkend="selection-api"> selection API </link> for
+          drivers and applications. See <link
-details.</para>
+          linkend="selection-api"> selection API </link> for
+          details.</para>
        </listitem>
      </orderedlist>
    </section>
@@ -2458,6 +2459,36 @@ details.</para>
      </orderedlist>
    </section>
+    <section>
+      <title>V4L2 in Linux 3.6</title>
+      <orderedlist>
+        <listitem>
+          <para>Replaced <structfield>input</structfield> in
+          <structname>v4l2_buffer</structname> by
+          <structfield>reserved2</structfield> and removed
+          <constant>V4L2_BUF_FLAG_INPUT</constant>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section>
+      <title>V4L2 in Linux 3.6</title>
+      <orderedlist>
+        <listitem>
+          <para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section>
+      <title>V4L2 in Linux 3.6</title>
+      <orderedlist>
+        <listitem>
+          <para>Added support for frequency band enumerations: &VIDIOC-ENUM-FREQ-BANDS;.</para>
+        </listitem>
+      </orderedlist>
+    </section>
    <section id="other">
      <title>Relation of V4L2 to other Linux multimedia APIs</title>
@@ -2587,6 +2618,9 @@ ioctls.</para>
          <para><link linkend="v4l2-auto-focus-area"><constant>
          V4L2_CID_AUTO_FOCUS_AREA</constant></link> control.</para>
        </listitem>
+        <listitem>
+          <para>Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl.</para>
+        </listitem>
      </itemizedlist>
    </section>
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index cda0dfb6769a..b0964fb4e834 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -373,6 +373,11 @@ minimum value disables backlight compensation.</entry>
          </entry>
          </row>
          <row>
+            <entry><constant>V4L2_CID_AUTOBRIGHTNESS</constant></entry>
+            <entry>boolean</entry>
+            <entry>Enable Automatic Brightness.</entry>
+          </row>
+          <row>
            <entry><constant>V4L2_CID_ROTATE</constant></entry>
            <entry>integer</entry>
            <entry>Rotates the image by specified angle. Common angles are 90,
diff --git a/Documentation/DocBook/media/v4l/dev-subdev.xml b/Documentation/DocBook/media/v4l/dev-subdev.xml
index 4afcbbec5eda..a3d9dd093268 100644
--- a/Documentation/DocBook/media/v4l/dev-subdev.xml
+++ b/Documentation/DocBook/media/v4l/dev-subdev.xml
@@ -276,7 +276,7 @@
      </para>
    </section>
-    <section>
+    <section id="v4l2-subdev-selections">
      <title>Selections: cropping, scaling and composition</title>
      <para>Many sub-devices support cropping frames on their input or output
@@ -290,8 +290,8 @@
      size. Both the coordinates and sizes are expressed in pixels.</para>
      <para>As for pad formats, drivers store try and active
-      rectangles for the selection targets of ACTUAL type <xref
+      rectangles for the selection targets <xref
-      linkend="v4l2-subdev-selection-targets">.</xref></para>
+      linkend="v4l2-selections-common" />.</para>
      <para>On sink pads, cropping is applied relative to the
      current pad format. The pad format represents the image size as
@@ -308,7 +308,7 @@
      <para>Scaling support is optional. When supported by a subdev,
      the crop rectangle on the subdev's sink pad is scaled to the
      size configured using the &VIDIOC-SUBDEV-S-SELECTION; IOCTL
-      using <constant>V4L2_SUBDEV_SEL_COMPOSE_ACTUAL</constant>
+      using <constant>V4L2_SEL_TGT_COMPOSE</constant>
      selection target on the same pad. If the subdev supports scaling
      but not composing, the top and left values are not used and must
      always be set to zero.</para>
@@ -323,32 +323,32 @@
      <para>The drivers should always use the closest possible
      rectangle the user requests on all selection targets, unless
      specifically told otherwise.
-      <constant>V4L2_SUBDEV_SEL_FLAG_SIZE_GE</constant> and
+      <constant>V4L2_SEL_FLAG_GE</constant> and
-      <constant>V4L2_SUBDEV_SEL_FLAG_SIZE_LE</constant> flags may be
+      <constant>V4L2_SEL_FLAG_LE</constant> flags may be
      used to round the image size either up or down. <xref
-      linkend="v4l2-subdev-selection-flags"></xref></para>
+      linkend="v4l2-selection-flags" /></para>
    </section>
    <section>
      <title>Types of selection targets</title>
      <section>
-        <title>ACTUAL targets</title>
+        <title>Actual targets</title>
-        <para>ACTUAL targets reflect the actual hardware configuration
+        <para>Actual targets (without a postfix) reflect the actual
-        at any point of time. There is a BOUNDS target
+        hardware configuration at any point of time. There is a BOUNDS
-        corresponding to every ACTUAL.</para>
+        target corresponding to every actual target.</para>
      </section>
      <section>
        <title>BOUNDS targets</title>
-        <para>BOUNDS targets is the smallest rectangle that contains
+        <para>BOUNDS targets is the smallest rectangle that contains all
-        all valid ACTUAL rectangles. It may not be possible to set the
+        valid actual rectangles. It may not be possible to set the actual
-        ACTUAL rectangle as large as the BOUNDS rectangle, however.
+        rectangle as large as the BOUNDS rectangle, however. This may be
-        This may be because e.g. a sensor's pixel array is not
+        because e.g. a sensor's pixel array is not rectangular but
-        rectangular but cross-shaped or round. The maximum size may
+        cross-shaped or round. The maximum size may also be smaller than the
-        also be smaller than the BOUNDS rectangle.</para>
+        BOUNDS rectangle.</para>
      </section>
    </section>
@@ -362,7 +362,7 @@
      performed by the user: the changes made will be propagated to
      any subsequent stages. If this behaviour is not desired, the
      user must set
-      <constant>V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG</constant> flag. This
+      <constant>V4L2_SEL_FLAG_KEEP_CONFIG</constant> flag. This
      flag causes no propagation of the changes are allowed in any
      circumstances. This may also cause the accessed rectangle to be
      adjusted by the driver, depending on the properties of the
diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml
index fd6aca2922b6..1885cc0755cb 100644
--- a/Documentation/DocBook/media/v4l/io.xml
+++ b/Documentation/DocBook/media/v4l/io.xml
@@ -683,14 +683,12 @@ memory, set by the application. See <xref linkend="userp" /> for details.
          </row>
          <row>
            <entry>__u32</entry>
-            <entry><structfield>input</structfield></entry>
+            <entry><structfield>reserved2</structfield></entry>
            <entry></entry>
-            <entry>Some video capture drivers support rapid and
+            <entry>A place holder for future extensions and custom
-synchronous video input changes, a function useful for example in
+(driver defined) buffer types
-video surveillance applications. For this purpose applications set the
+<constant>V4L2_BUF_TYPE_PRIVATE</constant> and higher. Applications
-<constant>V4L2_BUF_FLAG_INPUT</constant> flag, and this field to the
+should set this to 0.</entry>
-number of a video input as in &v4l2-input; field
-<structfield>index</structfield>.</entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -923,13 +921,6 @@ Drivers set or clear this flag when the <constant>VIDIOC_DQBUF</constant>
 ioctl is called.</entry>
          </row>
          <row>
-            <entry><constant>V4L2_BUF_FLAG_INPUT</constant></entry>
-            <entry>0x0200</entry>
-            <entry>The <structfield>input</structfield> field is valid.
-Applications set or clear this flag before calling the
-<constant>VIDIOC_QBUF</constant> ioctl.</entry>
-          </row>
-          <row>
            <entry><constant>V4L2_BUF_FLAG_PREPARED</constant></entry>
            <entry>0x0400</entry>
            <entry>The buffer has been prepared for I/O and can be queued by the
diff --git a/Documentation/DocBook/media/v4l/selection-api.xml b/Documentation/DocBook/media/v4l/selection-api.xml
index b299e4779354..e7ed5077834d 100644
--- a/Documentation/DocBook/media/v4l/selection-api.xml
+++ b/Documentation/DocBook/media/v4l/selection-api.xml
@@ -53,11 +53,11 @@ cropping and composing rectangles have the same size.</para>
        </mediaobject>
      </figure>
-For complete list of the available selection targets see table <xref
-linkend="v4l2-sel-target"/>
    </section>
+    See <xref linkend="v4l2-selection-targets" /> for more
+    information.
  <section>
  <title>Configuration</title>
@@ -74,7 +74,7 @@ cropping/composing rectangles may have to be aligned, and both the source and
 the sink may have arbitrary upper and lower size limits. Therefore, as usual,
 drivers are expected to adjust the requested parameters and return the actual
 values selected. An application can control the rounding behaviour using <link
-linkend="v4l2-sel-flags"> constraint flags </link>.</para>
+linkend="v4l2-selection-flags"> constraint flags </link>.</para>
   <section>
@@ -91,7 +91,7 @@ top/left corner at position <constant> (0,0) </constant>.  The rectangle's
 coordinates are expressed in pixels.</para>
 <para>The top left corner, width and height of the source rectangle, that is
-the area actually sampled, is given by the <constant> V4L2_SEL_TGT_CROP_ACTIVE
+the area actually sampled, is given by the <constant> V4L2_SEL_TGT_CROP
 </constant> target. It uses the same coordinate system as <constant>
 V4L2_SEL_TGT_CROP_BOUNDS </constant>. The active cropping area must lie
 completely inside the capture boundaries. The driver may further adjust the
@@ -111,13 +111,13 @@ height are equal to the image size set by <constant> VIDIOC_S_FMT </constant>.
 </para>
 <para>The part of a buffer into which the image is inserted by the hardware is
-controlled by the <constant> V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> target.
+controlled by the <constant> V4L2_SEL_TGT_COMPOSE </constant> target.
 The rectangle's coordinates are also expressed in the same coordinate system as
 the bounds rectangle. The composing rectangle must lie completely inside bounds
 rectangle. The driver must adjust the composing rectangle to fit to the
 bounding limits. Moreover, the driver can perform other adjustments according
 to hardware limitations. The application can control rounding behaviour using
-<link linkend="v4l2-sel-flags"> constraint flags </link>.</para>
+<link linkend="v4l2-selection-flags"> constraint flags </link>.</para>
 <para>For capture devices the default composing rectangle is queried using
 <constant> V4L2_SEL_TGT_COMPOSE_DEFAULT </constant>. It is usually equal to the
@@ -125,7 +125,7 @@ bounding rectangle.</para>
 <para>The part of a buffer that is modified by the hardware is given by
 <constant> V4L2_SEL_TGT_COMPOSE_PADDED </constant>. It contains all pixels
-defined using <constant> V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> plus all
+defined using <constant> V4L2_SEL_TGT_COMPOSE </constant> plus all
 padding data modified by hardware during insertion process. All pixels outside
 this rectangle <emphasis>must not</emphasis> be changed by the hardware. The
 content of pixels that lie inside the padded area but outside active area is
@@ -153,7 +153,7 @@ specified using <constant> VIDIOC_S_FMT </constant> ioctl.</para>
 <para>The top left corner, width and height of the source rectangle, that is
 the area from which image date are processed by the hardware, is given by the
-<constant> V4L2_SEL_TGT_CROP_ACTIVE </constant>. Its coordinates are expressed
+<constant> V4L2_SEL_TGT_CROP </constant>. Its coordinates are expressed
 in in the same coordinate system as the bounds rectangle. The active cropping
 area must lie completely inside the crop boundaries and the driver may further
 adjust the requested size and/or position according to hardware
@@ -165,7 +165,7 @@ bounding rectangle.</para>
 <para>The part of a video signal or graphics display where the image is
 inserted by the hardware is controlled by <constant>
-V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> target.  The rectangle's coordinates
+V4L2_SEL_TGT_COMPOSE </constant> target.  The rectangle's coordinates
 are expressed in pixels. The composing rectangle must lie completely inside the
 bounds rectangle.  The driver must adjust the area to fit to the bounding
 limits.  Moreover, the driver can perform other adjustments according to
@@ -184,7 +184,7 @@ such a padded area is driver-dependent feature not covered by this document.
 Driver developers are encouraged to keep padded rectangle equal to active one.
 The padded target is accessed by the <constant> V4L2_SEL_TGT_COMPOSE_PADDED
 </constant> identifier.  It must contain all pixels from the <constant>
-V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> target.</para>
+V4L2_SEL_TGT_COMPOSE </constant> target.</para>
   </section>
@@ -193,8 +193,8 @@ V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> target.</para>
     <title>Scaling control</title>
 <para>An application can detect if scaling is performed by comparing the width
-and the height of rectangles obtained using <constant> V4L2_SEL_TGT_CROP_ACTIVE
+and the height of rectangles obtained using <constant> V4L2_SEL_TGT_CROP
-</constant> and <constant> V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> targets. If
+</constant> and <constant> V4L2_SEL_TGT_COMPOSE </constant> targets. If
 these are not equal then the scaling is applied. The application can compute
 the scaling ratios using these values.</para>
@@ -252,7 +252,7 @@ area)</para>
        ret = ioctl(fd, &VIDIOC-G-SELECTION;, &amp;sel);
        if (ret)
                exit(-1);
-        sel.target = V4L2_SEL_TGT_CROP_ACTIVE;
+        sel.target = V4L2_SEL_TGT_CROP;
        ret = ioctl(fd, &VIDIOC-S-SELECTION;, &amp;sel);
        if (ret)
                exit(-1);
@@ -281,7 +281,7 @@ area)</para>
        r.left = sel.r.width / 4;
        r.top = sel.r.height / 4;
        sel.r = r;
-        sel.target = V4L2_SEL_TGT_COMPOSE_ACTIVE;
+        sel.target = V4L2_SEL_TGT_COMPOSE;
        sel.flags = V4L2_SEL_FLAG_LE;
        ret = ioctl(fd, &VIDIOC-S-SELECTION;, &amp;sel);
        if (ret)
@@ -298,11 +298,11 @@ V4L2_BUF_TYPE_VIDEO_OUTPUT </constant> for other devices</para>
        &v4l2-selection; compose = {
                .type = V4L2_BUF_TYPE_VIDEO_OUTPUT,
-                .target = V4L2_SEL_TGT_COMPOSE_ACTIVE,
+                .target = V4L2_SEL_TGT_COMPOSE,
        };
        &v4l2-selection; crop = {
                .type = V4L2_BUF_TYPE_VIDEO_OUTPUT,
-                .target = V4L2_SEL_TGT_CROP_ACTIVE,
+                .target = V4L2_SEL_TGT_CROP,
        };
        double hscale, vscale;
diff --git a/Documentation/DocBook/media/v4l/selections-common.xml b/Documentation/DocBook/media/v4l/selections-common.xml
new file mode 100644
index 000000000000..7502f784b8cc
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/selections-common.xml
@@ -0,0 +1,164 @@
+<section id="v4l2-selections-common">
+  <title>Common selection definitions</title>
+  <para>While the <link linkend="selection-api">V4L2 selection
+  API</link> and <link linkend="v4l2-subdev-selections">V4L2 subdev
+  selection APIs</link> are very similar, there's one fundamental
+  difference between the two. On sub-device API, the selection
+  rectangle refers to the media bus format, and is bound to a
+  sub-device's pad. On the V4L2 interface the selection rectangles
+  refer to the in-memory pixel format.</para>
+  <para>This section defines the common definitions of the
+  selection interfaces on the two APIs.</para>
+  <section id="v4l2-selection-targets">
+    <title>Selection targets</title>
+    <para>The precise meaning of the selection targets may be
+    dependent on which of the two interfaces they are used.</para>
+    <table pgwide="1" frame="none" id="v4l2-selection-targets-table">
+    <title>Selection target definitions</title>
+      <tgroup cols="5">
+        <colspec colname="c1" />
+        <colspec colname="c2" />
+        <colspec colname="c3" />
+        <colspec colname="c4" />
+        <colspec colname="c5" />
+        &cs-def;
+        <thead>
+          <row rowsep="1">
+            <entry align="left">Target name</entry>
+            <entry align="left">id</entry>
+            <entry align="left">Definition</entry>
+            <entry align="left">Valid for V4L2</entry>
+            <entry align="left">Valid for V4L2 subdev</entry>
+          </row>
+        </thead>
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_SEL_TGT_CROP</constant></entry>
+            <entry>0x0000</entry>
+            <entry>Crop rectangle. Defines the cropped area.</entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_CROP_DEFAULT</constant></entry>
+            <entry>0x0001</entry>
+            <entry>Suggested cropping rectangle that covers the "whole picture".</entry>
+            <entry>Yes</entry>
+            <entry>No</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_CROP_BOUNDS</constant></entry>
+            <entry>0x0002</entry>
+            <entry>Bounds of the crop rectangle. All valid crop
+            rectangles fit inside the crop bounds rectangle.
+            </entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_COMPOSE</constant></entry>
+            <entry>0x0100</entry>
+            <entry>Compose rectangle. Used to configure scaling
+            and composition.</entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_COMPOSE_DEFAULT</constant></entry>
+            <entry>0x0101</entry>
+            <entry>Suggested composition rectangle that covers the "whole picture".</entry>
+            <entry>Yes</entry>
+            <entry>No</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_COMPOSE_BOUNDS</constant></entry>
+            <entry>0x0102</entry>
+            <entry>Bounds of the compose rectangle. All valid compose
+            rectangles fit inside the compose bounds rectangle.</entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_TGT_COMPOSE_PADDED</constant></entry>
+            <entry>0x0103</entry>
+            <entry>The active area and all padding pixels that are inserted or
+            modified by hardware.</entry>
+            <entry>Yes</entry>
+            <entry>No</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+  <section id="v4l2-selection-flags">
+    <title>Selection flags</title>
+    <table pgwide="1" frame="none" id="v4l2-selection-flags-table">
+    <title>Selection flag definitions</title>
+      <tgroup cols="5">
+        <colspec colname="c1" />
+        <colspec colname="c2" />
+        <colspec colname="c3" />
+        <colspec colname="c4" />
+        <colspec colname="c5" />
+        &cs-def;
+        <thead>
+        <row rowsep="1">
+            <entry align="left">Flag name</entry>
+            <entry align="left">id</entry>
+            <entry align="left">Definition</entry>
+            <entry align="left">Valid for V4L2</entry>
+            <entry align="left">Valid for V4L2 subdev</entry>
+        </row>
+        </thead>
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_SEL_FLAG_GE</constant></entry>
+            <entry>(1 &lt;&lt; 0)</entry>
+            <entry>Suggest the driver it should choose greater or
+            equal rectangle (in size) than was requested. Albeit the
+            driver may choose a lesser size, it will only do so due to
+            hardware limitations. Without this flag (and
+            <constant>V4L2_SEL_FLAG_LE</constant>) the
+            behaviour is to choose the closest possible
+            rectangle.</entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_FLAG_LE</constant></entry>
+            <entry>(1 &lt;&lt; 1)</entry>
+            <entry>Suggest the driver it
+            should choose lesser or equal rectangle (in size) than was
+            requested. Albeit the driver may choose a greater size, it
+            will only do so due to hardware limitations.</entry>
+            <entry>Yes</entry>
+            <entry>Yes</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_SEL_FLAG_KEEP_CONFIG</constant></entry>
+            <entry>(1 &lt;&lt; 2)</entry>
+            <entry>The configuration must not be propagated to any
+            further processing steps. If this flag is not given, the
+            configuration is propagated inside the subdevice to all
+            further processing steps.</entry>
+            <entry>No</entry>
+            <entry>Yes</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+</section>
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index 008c2d73a484..eee6908c749f 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -140,6 +140,11 @@ structs, ioctls) must be noted in more detail in the history chapter
 applications. -->
      <revision>
+        <revnumber>3.6</revnumber>
+        <date>2012-07-02</date>
+        <authorinitials>hv</authorinitials>
+        <revremark>Added VIDIOC_ENUM_FREQ_BANDS.
+        </revremark>
        <revnumber>3.5</revnumber>
        <date>2012-05-07</date>
        <authorinitials>sa, sn</authorinitials>
@@ -534,6 +539,7 @@ and discussions on the V4L mailing list.</revremark>
    &sub-enum-fmt;
    &sub-enum-framesizes;
    &sub-enum-frameintervals;
+    &sub-enum-freq-bands;
    &sub-enuminput;
    &sub-enumoutput;
    &sub-enumstd;
@@ -589,6 +595,11 @@ and discussions on the V4L mailing list.</revremark>
    &sub-write;
  </appendix>
+  <appendix>
+    <title>Common definitions for V4L2 and V4L2 subdev interfaces</title>
+      &sub-selections-common;
+  </appendix>
  <appendix id="videodev">
    <title>Video For Linux Two Header File</title>
    &sub-videodev2-h;
diff --git a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
index a2474ecb574a..a8cda1acacd9 100644
--- a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
@@ -64,7 +64,7 @@ different sizes.</para>
    <para>To allocate device buffers applications initialize relevant fields of
 the <structname>v4l2_create_buffers</structname> structure. They set the
 <structfield>type</structfield> field in the
-<structname>v4l2_format</structname> structure, embedded in this
+&v4l2-format; structure, embedded in this
 structure, to the respective stream or buffer type.
 <structfield>count</structfield> must be set to the number of required buffers.
 <structfield>memory</structfield> specifies the required I/O method. The
@@ -97,7 +97,13 @@ information.</para>
          <row>
            <entry>__u32</entry>
            <entry><structfield>count</structfield></entry>
-            <entry>The number of buffers requested or granted.</entry>
+            <entry>The number of buffers requested or granted. If count == 0, then
+            <constant>VIDIOC_CREATE_BUFS</constant> will set <structfield>index</structfield>
+            to the current number of created buffers, and it will check the validity of
+            <structfield>memory</structfield> and <structfield>format.type</structfield>.
+            If those are invalid -1 is returned and errno is set to &EINVAL;,
+            otherwise <constant>VIDIOC_CREATE_BUFS</constant> returns 0. It will
+            never set errno to &EBUSY; in this particular case.</entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -108,7 +114,7 @@ information.</para>
 /></entry>
          </row>
          <row>
-            <entry>struct&nbsp;v4l2_format</entry>
+            <entry>&v4l2-format;</entry>
            <entry><structfield>format</structfield></entry>
            <entry>Filled in by the application, preserved by the driver.</entry>
          </row>
diff --git a/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml b/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
index 6673ce582050..cd7720d404ea 100644
--- a/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
@@ -54,15 +54,9 @@
      interface and may change in the future.</para>
    </note>
-    <para>To query the available timings, applications initialize the
+    <para>To query the capabilities of the DV receiver/transmitter applications can call
-<structfield>index</structfield> field and zero the reserved array of &v4l2-dv-timings-cap;
+this ioctl and the driver will fill in the structure. Note that drivers may return
-and call the <constant>VIDIOC_DV_TIMINGS_CAP</constant> ioctl with a pointer to this
+different values after switching the video input or output.</para>
-structure. Drivers fill the rest of the structure or return an
-&EINVAL; when the index is out of bounds. To enumerate all supported DV timings,
-applications shall begin at index zero, incrementing by one until the
-driver returns <errorcode>EINVAL</errorcode>. Note that drivers may enumerate a
-different set of DV timings after switching the video input or
-output.</para>
    <table pgwide="1" frame="none" id="v4l2-bt-timings-cap">
      <title>struct <structname>v4l2_bt_timings_cap</structname></title>
@@ -115,7 +109,7 @@ output.</para>
          <row>
            <entry>__u32</entry>
            <entry><structfield>reserved</structfield>[16]</entry>
-            <entry></entry>
+            <entry>Reserved for future extensions. Drivers must set the array to zero.</entry>
          </row>
        </tbody>
      </tgroup>
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml b/Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml
new file mode 100644
index 000000000000..6541ba0175ed
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml
@@ -0,0 +1,179 @@
+<refentry id="vidioc-enum-freq-bands">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_ENUM_FREQ_BANDS</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname>VIDIOC_ENUM_FREQ_BANDS</refname>
+    <refpurpose>Enumerate supported frequency bands</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>struct v4l2_frequency_band
+*<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Arguments</title>
+    <variablelist>
+      <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_ENUM_FREQ_BANDS</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>Description</title>
+    <note>
+      <title>Experimental</title>
+      <para>This is an <link linkend="experimental"> experimental </link>
+      interface and may change in the future.</para>
+    </note>
+    <para>Enumerates the frequency bands that a tuner or modulator supports.
+To do this applications initialize the <structfield>tuner</structfield>,
+<structfield>type</structfield> and <structfield>index</structfield> fields,
+and zero out the <structfield>reserved</structfield> array of a &v4l2-frequency-band; and
+call the <constant>VIDIOC_ENUM_FREQ_BANDS</constant> ioctl with a pointer
+to this structure.</para>
+    <para>This ioctl is supported if the <constant>V4L2_TUNER_CAP_FREQ_BANDS</constant> capability
+    of the corresponding tuner/modulator is set.</para>
+    <table pgwide="1" frame="none" id="v4l2-frequency-band">
+      <title>struct <structname>v4l2_frequency_band</structname></title>
+      <tgroup cols="3">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>tuner</structfield></entry>
+            <entry>The tuner or modulator index number. This is the
+same value as in the &v4l2-input; <structfield>tuner</structfield>
+field and the &v4l2-tuner; <structfield>index</structfield> field, or
+the &v4l2-output; <structfield>modulator</structfield> field and the
+&v4l2-modulator; <structfield>index</structfield> field.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>type</structfield></entry>
+            <entry>The tuner type. This is the same value as in the
+&v4l2-tuner; <structfield>type</structfield> field. The type must be set
+to <constant>V4L2_TUNER_RADIO</constant> for <filename>/dev/radioX</filename>
+device nodes, and to <constant>V4L2_TUNER_ANALOG_TV</constant>
+for all others. Set this field to <constant>V4L2_TUNER_RADIO</constant> for
+modulators (currently only radio modulators are supported).
+See <xref linkend="v4l2-tuner-type" /></entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>index</structfield></entry>
+            <entry>Identifies the frequency band, set by the application.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>capability</structfield></entry>
+            <entry spanname="hspan">The tuner/modulator capability flags for
+this frequency band, see <xref linkend="tuner-capability" />. The <constant>V4L2_TUNER_CAP_LOW</constant>
+capability must be the same for all frequency bands of the selected tuner/modulator.
+So either all bands have that capability set, or none of them have that capability.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>rangelow</structfield></entry>
+            <entry spanname="hspan">The lowest tunable frequency in
+units of 62.5 kHz, or if the <structfield>capability</structfield>
+flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz, for this frequency band.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>rangehigh</structfield></entry>
+            <entry spanname="hspan">The highest tunable frequency in
+units of 62.5 kHz, or if the <structfield>capability</structfield>
+flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
+Hz, for this frequency band.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>modulation</structfield></entry>
+            <entry spanname="hspan">The supported modulation systems of this frequency band.
+            See <xref linkend="band-modulation" />. Note that currently only one
+            modulation system per frequency band is supported. More work will need to
+            be done if multiple modulation systems are possible. Contact the
+            linux-media mailing list (&v4l-ml;) if you need that functionality.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[9]</entry>
+            <entry>Reserved for future extensions. Applications and drivers
+            must set the array to zero.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <table pgwide="1" frame="none" id="band-modulation">
+      <title>Band Modulation Systems</title>
+      <tgroup cols="3">
+        &cs-def;
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_BAND_MODULATION_VSB</constant></entry>
+            <entry>0x02</entry>
+            <entry>Vestigial Sideband modulation, used for analog TV.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_BAND_MODULATION_FM</constant></entry>
+            <entry>0x04</entry>
+            <entry>Frequency Modulation, commonly used for analog radio.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_BAND_MODULATION_AM</constant></entry>
+            <entry>0x08</entry>
+            <entry>Amplitude Modulation, commonly used for analog radio.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+  <refsect1>
+    &return-value;
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>The <structfield>tuner</structfield> or <structfield>index</structfield>
+is out of bounds or the <structfield>type</structfield> field is wrong.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
index 69c178a4d205..c7a1c462e724 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
@@ -98,11 +98,12 @@ the &v4l2-output; <structfield>modulator</structfield> field and the
            <entry>__u32</entry>
            <entry><structfield>type</structfield></entry>
            <entry>The tuner type. This is the same value as in the
-&v4l2-tuner; <structfield>type</structfield> field. See The type must be set
+&v4l2-tuner; <structfield>type</structfield> field. The type must be set
 to <constant>V4L2_TUNER_RADIO</constant> for <filename>/dev/radioX</filename>
 device nodes, and to <constant>V4L2_TUNER_ANALOG_TV</constant>
-for all others. The field is not applicable to modulators, &ie; ignored
+for all others. Set this field to <constant>V4L2_TUNER_RADIO</constant> for
-by drivers. See <xref linkend="v4l2-tuner-type" /></entry>
+modulators (currently only radio modulators are supported).
+See <xref linkend="v4l2-tuner-type" /></entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -135,6 +136,12 @@ bounds or the value in the <structfield>type</structfield> field is
 wrong.</para>
        </listitem>
      </varlistentry>
+      <varlistentry>
+        <term><errorcode>EBUSY</errorcode></term>
+        <listitem>
+          <para>A hardware seek is in progress.</para>
+        </listitem>
+      </varlistentry>
    </variablelist>
  </refsect1>
 </refentry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
index bb04eff75f45..f76d8a6d9b92 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
@@ -65,9 +65,9 @@ Do not use multiplanar buffers.  Use <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE
 </constant>.  Use <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT </constant> instead of
 <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE </constant>.  The next step is
 setting the value of &v4l2-selection; <structfield>target</structfield> field
-to <constant> V4L2_SEL_TGT_CROP_ACTIVE </constant> (<constant>
+to <constant> V4L2_SEL_TGT_CROP </constant> (<constant>
-V4L2_SEL_TGT_COMPOSE_ACTIVE </constant>).  Please refer to table <xref
+V4L2_SEL_TGT_COMPOSE </constant>).  Please refer to table <xref
-linkend="v4l2-sel-target" /> or <xref linkend="selection-api" /> for additional
+linkend="v4l2-selections-common" /> or <xref linkend="selection-api" /> for additional
 targets.  The <structfield>flags</structfield> and <structfield>reserved
 </structfield> fields of &v4l2-selection; are ignored and they must be filled
 with zeros.  The driver fills the rest of the structure or
@@ -86,9 +86,9 @@ use multiplanar buffers.  Use <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE
 </constant>.  Use <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT </constant> instead of
 <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE </constant>.  The next step is
 setting the value of &v4l2-selection; <structfield>target</structfield> to
-<constant>V4L2_SEL_TGT_CROP_ACTIVE</constant> (<constant>
+<constant>V4L2_SEL_TGT_CROP</constant> (<constant>
-V4L2_SEL_TGT_COMPOSE_ACTIVE </constant>). Please refer to table <xref
+V4L2_SEL_TGT_COMPOSE </constant>). Please refer to table <xref
-linkend="v4l2-sel-target" /> or <xref linkend="selection-api" /> for additional
+linkend="v4l2-selections-common" /> or <xref linkend="selection-api" /> for additional
 targets.  The &v4l2-rect; <structfield>r</structfield> rectangle need to be
 set to the desired active area. Field &v4l2-selection; <structfield> reserved
 </structfield> is ignored and must be filled with zeros.  The driver may adjust
@@ -154,74 +154,8 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
  </refsect1>
-  <refsect1>
+  <para>Selection targets and flags are documented in <xref
-    <table frame="none" pgwide="1" id="v4l2-sel-target">
+  linkend="v4l2-selections-common"/>.</para>
-      <title>Selection targets.</title>
-      <tgroup cols="3">
-        &cs-def;
-        <tbody valign="top">
-          <row>
-            <entry><constant>V4L2_SEL_TGT_CROP_ACTIVE</constant></entry>
-            <entry>0x0000</entry>
-            <entry>The area that is currently cropped by hardware.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_CROP_DEFAULT</constant></entry>
-            <entry>0x0001</entry>
-            <entry>Suggested cropping rectangle that covers the "whole picture".</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_CROP_BOUNDS</constant></entry>
-            <entry>0x0002</entry>
-            <entry>Limits for the cropping rectangle.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_COMPOSE_ACTIVE</constant></entry>
-            <entry>0x0100</entry>
-            <entry>The area to which data is composed by hardware.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_COMPOSE_DEFAULT</constant></entry>
-            <entry>0x0101</entry>
-            <entry>Suggested composing rectangle that covers the "whole picture".</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_COMPOSE_BOUNDS</constant></entry>
-            <entry>0x0102</entry>
-            <entry>Limits for the composing rectangle.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_TGT_COMPOSE_PADDED</constant></entry>
-            <entry>0x0103</entry>
-            <entry>The active area and all padding pixels that are inserted or modified by hardware.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </refsect1>
-  <refsect1>
-    <table frame="none" pgwide="1" id="v4l2-sel-flags">
-      <title>Selection constraint flags</title>
-      <tgroup cols="3">
-        &cs-def;
-        <tbody valign="top">
-          <row>
-            <entry><constant>V4L2_SEL_FLAG_GE</constant></entry>
-            <entry>0x00000001</entry>
-            <entry>Indicates that the adjusted rectangle must contain the original
-            &v4l2-selection; <structfield>r</structfield> rectangle.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SEL_FLAG_LE</constant></entry>
-            <entry>0x00000002</entry>
-            <entry>Indicates that the adjusted rectangle must be inside the original
-            &v4l2-rect; <structfield>r</structfield> rectangle.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-  </refsect1>
    <section>
      <figure id="sel-const-adjust">
@@ -252,14 +186,14 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
          <row>
            <entry>__u32</entry>
            <entry><structfield>target</structfield></entry>
-            <entry>Used to select between <link linkend="v4l2-sel-target"> cropping
+            <entry>Used to select between <link linkend="v4l2-selections-common"> cropping
            and composing rectangles</link>.</entry>
          </row>
          <row>
            <entry>__u32</entry>
            <entry><structfield>flags</structfield></entry>
            <entry>Flags controlling the selection rectangle adjustments, refer to
-            <link linkend="v4l2-sel-flags">selection flags</link>.</entry>
+            <link linkend="v4l2-selection-flags">selection flags</link>.</entry>
          </row>
          <row>
            <entry>&v4l2-rect;</entry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml b/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml
index 62a1aa200a36..720395127904 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml
@@ -119,10 +119,14 @@ field is not quite clear.--></para></entry>
 <xref linkend="tuner-capability" />. Audio flags indicate the ability
 to decode audio subprograms. They will <emphasis>not</emphasis>
 change, for example with the current video standard.</para><para>When
-the structure refers to a radio tuner only the
+the structure refers to a radio tuner the
-<constant>V4L2_TUNER_CAP_LOW</constant>,
+<constant>V4L2_TUNER_CAP_LANG1</constant>,
-<constant>V4L2_TUNER_CAP_STEREO</constant> and
+<constant>V4L2_TUNER_CAP_LANG2</constant> and
-<constant>V4L2_TUNER_CAP_RDS</constant> flags can be set.</para></entry>
+<constant>V4L2_TUNER_CAP_NORM</constant> flags can't be used.</para>
+<para>If multiple frequency bands are supported, then
+<structfield>capability</structfield> is the union of all
+<structfield>capability></structfield> fields of each &v4l2-frequency-band;.
+</para></entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -130,7 +134,9 @@ the structure refers to a radio tuner only the
            <entry spanname="hspan">The lowest tunable frequency in
 units of 62.5 kHz, or if the <structfield>capability</structfield>
 flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
-Hz.</entry>
+Hz. If multiple frequency bands are supported, then
+<structfield>rangelow</structfield> is the lowest frequency
+of all the frequency bands.</entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -138,7 +144,9 @@ Hz.</entry>
            <entry spanname="hspan">The highest tunable frequency in
 units of 62.5 kHz, or if the <structfield>capability</structfield>
 flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
-Hz.</entry>
+Hz. If multiple frequency bands are supported, then
+<structfield>rangehigh</structfield> is the highest frequency
+of all the frequency bands.</entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -276,6 +284,18 @@ can or must be switched. (B/G PAL tuners for example are typically not
      <constant>V4L2_TUNER_ANALOG_TV</constant> tuners can have this capability.</entry>
          </row>
          <row>
+            <entry><constant>V4L2_TUNER_CAP_HWSEEK_BOUNDED</constant></entry>
+            <entry>0x0004</entry>
+            <entry>If set, then this tuner supports the hardware seek functionality
+            where the seek stops when it reaches the end of the frequency range.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_TUNER_CAP_HWSEEK_WRAP</constant></entry>
+            <entry>0x0008</entry>
+            <entry>If set, then this tuner supports the hardware seek functionality
+            where the seek wraps around when it reaches the end of the frequency range.</entry>
+          </row>
+          <row>
        <entry><constant>V4L2_TUNER_CAP_STEREO</constant></entry>
        <entry>0x0010</entry>
        <entry>Stereo audio reception is supported.</entry>
@@ -328,6 +348,12 @@ radio tuners.</entry>
        <entry>0x0200</entry>
        <entry>The RDS data is parsed by the hardware and set via controls.</entry>
          </row>
+          <row>
+        <entry><constant>V4L2_TUNER_CAP_FREQ_BANDS</constant></entry>
+        <entry>0x0400</entry>
+        <entry>The &VIDIOC-ENUM-FREQ-BANDS; ioctl can be used to enumerate
+        the available frequency bands.</entry>
+          </row>
        </tbody>
      </tgroup>
    </table>
diff --git a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml
index 9caa49af580f..77ff5be0809d 100644
--- a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml
@@ -71,12 +71,9 @@ initialize the <structfield>bytesused</structfield>,
 <structfield>field</structfield> and
 <structfield>timestamp</structfield> fields, see <xref
 linkend="buffer" /> for details.
-Applications must also set <structfield>flags</structfield> to 0. If a driver
+Applications must also set <structfield>flags</structfield> to 0.
-supports capturing from specific video inputs and you want to specify a video
+The <structfield>reserved2</structfield> and
-input, then <structfield>flags</structfield> should be set to
+<structfield>reserved</structfield> fields must be set to 0. When using
-<constant>V4L2_BUF_FLAG_INPUT</constant> and the field
-<structfield>input</structfield> must be initialized to the desired input.
-The <structfield>reserved</structfield> field must be set to 0. When using
 the <link linkend="planar-apis">multi-planar API</link>, the
 <structfield>m.planes</structfield> field must contain a userspace pointer
 to a filled-in array of &v4l2-plane; and the <structfield>length</structfield>
diff --git a/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index 4643505cd4ca..f33dd746b66b 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -192,6 +192,19 @@ linkend="output">Video Output</link> interface.</entry>
            <link linkend="output">Video Output</link> interface.</entry>
          </row>
          <row>
+            <entry><constant>V4L2_CAP_VIDEO_M2M</constant></entry>
+            <entry>0x00004000</entry>
+            <entry>The device supports the single-planar API through the
+            Video Memory-To-Memory interface.</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_CAP_VIDEO_M2M_MPLANE</constant></entry>
+            <entry>0x00008000</entry>
+            <entry>The device supports the
+            <link linkend="planar-apis">multi-planar API</link> through the
+            Video Memory-To-Memory  interface.</entry>
+          </row>
+          <row>
            <entry><constant>V4L2_CAP_VIDEO_OVERLAY</constant></entry>
            <entry>0x00000004</entry>
            <entry>The device supports the <link
diff --git a/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
index 407dfceb71f0..3dd1bec6d3c7 100644
--- a/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
@@ -52,11 +52,26 @@
    <para>Start a hardware frequency seek from the current frequency.
 To do this applications initialize the <structfield>tuner</structfield>,
 <structfield>type</structfield>, <structfield>seek_upward</structfield>,
-<structfield>spacing</structfield> and
+<structfield>wrap_around</structfield>, <structfield>spacing</structfield>,
-<structfield>wrap_around</structfield> fields, and zero out the
+<structfield>rangelow</structfield> and <structfield>rangehigh</structfield>
-<structfield>reserved</structfield> array of a &v4l2-hw-freq-seek; and
+fields, and zero out the <structfield>reserved</structfield> array of a
-call the <constant>VIDIOC_S_HW_FREQ_SEEK</constant> ioctl with a pointer
+&v4l2-hw-freq-seek; and call the <constant>VIDIOC_S_HW_FREQ_SEEK</constant>
-to this structure.</para>
+ioctl with a pointer to this structure.</para>
+    <para>The <structfield>rangelow</structfield> and
+<structfield>rangehigh</structfield> fields can be set to a non-zero value to
+tell the driver to search a specific band. If the &v4l2-tuner;
+<structfield>capability</structfield> field has the
+<constant>V4L2_TUNER_CAP_HWSEEK_PROG_LIM</constant> flag set, these values
+must fall within one of the bands returned by &VIDIOC-ENUM-FREQ-BANDS;. If
+the <constant>V4L2_TUNER_CAP_HWSEEK_PROG_LIM</constant> flag is not set,
+then these values must exactly match those of one of the bands returned by
+&VIDIOC-ENUM-FREQ-BANDS;. If the current frequency of the tuner does not fall
+within the selected band it will be clamped to fit in the band before the
+seek is started.</para>
+    <para>If an error is returned, then the original frequency will
+    be restored.</para>
    <para>This ioctl is supported if the <constant>V4L2_CAP_HW_FREQ_SEEK</constant> capability is set.</para>
@@ -87,7 +102,10 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
          <row>
            <entry>__u32</entry>
            <entry><structfield>wrap_around</structfield></entry>
-            <entry>If non-zero, wrap around when at the end of the frequency range, else stop seeking.</entry>
+            <entry>If non-zero, wrap around when at the end of the frequency range, else stop seeking.
+            The &v4l2-tuner; <structfield>capability</structfield> field will tell you what the
+            hardware supports.
+            </entry>
          </row>
          <row>
            <entry>__u32</entry>
@@ -96,7 +114,27 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
          </row>
          <row>
            <entry>__u32</entry>
-            <entry><structfield>reserved</structfield>[7]</entry>
+            <entry><structfield>rangelow</structfield></entry>
+            <entry>If non-zero, the lowest tunable frequency of the band to
+search in units of 62.5 kHz, or if the &v4l2-tuner;
+<structfield>capability</structfield> field has the
+<constant>V4L2_TUNER_CAP_LOW</constant> flag set, in units of 62.5 Hz.
+If <structfield>rangelow</structfield> is zero a reasonable default value
+is used.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>rangehigh</structfield></entry>
+            <entry>If non-zero, the highest tunable frequency of the band to
+search in units of 62.5 kHz, or if the &v4l2-tuner;
+<structfield>capability</structfield> field has the
+<constant>V4L2_TUNER_CAP_LOW</constant> flag set, in units of 62.5 Hz.
+If <structfield>rangehigh</structfield> is zero a reasonable default value
+is used.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[5]</entry>
            <entry>Reserved for future extensions. Applications
            must set the array to zero.</entry>
          </row>
@@ -113,14 +151,22 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
        <term><errorcode>EINVAL</errorcode></term>
        <listitem>
          <para>The <structfield>tuner</structfield> index is out of
-bounds, the wrap_around value is not supported or the value in the <structfield>type</structfield> field is
+bounds, the <structfield>wrap_around</structfield> value is not supported or
-wrong.</para>
+one of the values in the <structfield>type</structfield>,
+<structfield>rangelow</structfield> or <structfield>rangehigh</structfield>
+fields is wrong.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><errorcode>ENODATA</errorcode></term>
+        <listitem>
+          <para>The hardware seek found no channels.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
-        <term><errorcode>EAGAIN</errorcode></term>
+        <term><errorcode>EBUSY</errorcode></term>
        <listitem>
-          <para>The ioctl timed-out. Try again.</para>
+          <para>Another hardware seek is already in progress.</para>
        </listitem>
      </varlistentry>
    </variablelist>
diff --git a/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml
index 208e9f0da3f3..f33cc814a01d 100644
--- a/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-subdev-g-selection.xml
@@ -72,10 +72,10 @@
    <section>
      <title>Types of selection targets</title>
-      <para>There are two types of selection targets: actual and bounds.
+      <para>There are two types of selection targets: actual and bounds. The
-      The ACTUAL targets are the targets which configure the hardware.
+      actual targets are the targets which configure the hardware. The BOUNDS
-      The BOUNDS target will return a rectangle that contain all
+      target will return a rectangle that contain all possible actual
-      possible ACTUAL rectangles.</para>
+      rectangles.</para>
    </section>
    <section>
@@ -87,71 +87,8 @@
      <constant>EINVAL</constant>.</para>
    </section>
-    <table pgwide="1" frame="none" id="v4l2-subdev-selection-targets">
+    <para>Selection targets and flags are documented in <xref
-      <title>V4L2 subdev selection targets</title>
+    linkend="v4l2-selections-common"/>.</para>
-      <tgroup cols="3">
-        &cs-def;
-        <tbody valign="top">
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_TGT_CROP_ACTUAL</constant></entry>
-            <entry>0x0000</entry>
-            <entry>Actual crop. Defines the cropping
-            performed by the processing step.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_TGT_CROP_BOUNDS</constant></entry>
-            <entry>0x0002</entry>
-            <entry>Bounds of the crop rectangle.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_TGT_COMPOSE_ACTUAL</constant></entry>
-            <entry>0x0100</entry>
-            <entry>Actual compose rectangle. Used to configure scaling
-            on sink pads and composition on source pads.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_TGT_COMPOSE_BOUNDS</constant></entry>
-            <entry>0x0102</entry>
-            <entry>Bounds of the compose rectangle.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
-    <table pgwide="1" frame="none" id="v4l2-subdev-selection-flags">
-      <title>V4L2 subdev selection flags</title>
-      <tgroup cols="3">
-        &cs-def;
-        <tbody valign="top">
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_FLAG_SIZE_GE</constant></entry>
-            <entry>(1 &lt;&lt; 0)</entry> <entry>Suggest the driver it
-            should choose greater or equal rectangle (in size) than
-            was requested. Albeit the driver may choose a lesser size,
-            it will only do so due to hardware limitations. Without
-            this flag (and
-            <constant>V4L2_SUBDEV_SEL_FLAG_SIZE_LE</constant>) the
-            behaviour is to choose the closest possible
-            rectangle.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_FLAG_SIZE_LE</constant></entry>
-            <entry>(1 &lt;&lt; 1)</entry> <entry>Suggest the driver it
-            should choose lesser or equal rectangle (in size) than was
-            requested. Albeit the driver may choose a greater size, it
-            will only do so due to hardware limitations.</entry>
-          </row>
-          <row>
-            <entry><constant>V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG</constant></entry>
-            <entry>(1 &lt;&lt; 2)</entry>
-            <entry>The configuration should not be propagated to any
-            further processing steps. If this flag is not given, the
-            configuration is propagated inside the subdevice to all
-            further processing steps.</entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </table>
    <table pgwide="1" frame="none" id="v4l2-subdev-selection">
      <title>struct <structname>v4l2_subdev_selection</structname></title>
@@ -173,13 +110,13 @@
            <entry>__u32</entry>
            <entry><structfield>target</structfield></entry>
            <entry>Target selection rectangle. See
-            <xref linkend="v4l2-subdev-selection-targets">.</xref>.</entry>
+            <xref linkend="v4l2-selections-common" />.</entry>
          </row>
          <row>
            <entry>__u32</entry>
            <entry><structfield>flags</structfield></entry>
            <entry>Flags. See
-            <xref linkend="v4l2-subdev-selection-flags">.</xref></entry>
+            <xref linkend="v4l2-selection-flags" />.</entry>
          </row>
          <row>
            <entry>&v4l2-rect;</entry>
diff --git a/Documentation/IRQ-domain.txt b/Documentation/IRQ-domain.txt
index 27dcaabfb4db..1401cece745a 100644
--- a/Documentation/IRQ-domain.txt
+++ b/Documentation/IRQ-domain.txt
@@ -93,6 +93,7 @@ Linux IRQ number into the hardware.
 Most drivers cannot use this mapping.
 ==== Legacy ====
+irq_domain_add_simple()
 irq_domain_add_legacy()
 irq_domain_add_legacy_isa()
@@ -115,3 +116,7 @@ The legacy map should only be used if fixed IRQ mappings must be
 supported.  For example, ISA controllers would use the legacy map for
 mapping Linux IRQs 0-15 so that existing ISA drivers get the correct IRQ
 numbers.
+Most users of legacy mappings should use irq_domain_add_simple() which
+will use a legacy domain only if an IRQ range is supplied by the
+system and will otherwise use a linear domain mapping.
diff --git a/Documentation/ManagementStyle b/Documentation/ManagementStyle
index a5f0ea58c788..a211ee8d8b44 100644
--- a/Documentation/ManagementStyle
+++ b/Documentation/ManagementStyle
@@ -178,7 +178,7 @@ sadly that you are one too, and that while we can all bask in the secure
 knowledge that we're better than the average person (let's face it,
 nobody ever believes that they're average or below-average), we should
 also admit that we're not the sharpest knife around, and there will be
-other people that are less of an idiot that you are. 
+other people that are less of an idiot than you are. 
 Some people react badly to smart people.  Others take advantage of them. 
diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt
index 5c8d74968090..fc103d7a0474 100644
--- a/Documentation/RCU/checklist.txt
+++ b/Documentation/RCU/checklist.txt
@@ -162,9 +162,9 @@ over a rather long period of time, but improvements are always welcome!
                when publicizing a pointer to a structure that can
                be traversed by an RCU read-side critical section.
-5.      If call_rcu(), or a related primitive such as call_rcu_bh() or
+5.      If call_rcu(), or a related primitive such as call_rcu_bh(),
-        call_rcu_sched(), is used, the callback function must be
+        call_rcu_sched(), or call_srcu() is used, the callback function
-        written to be called from softirq context.  In particular,
+        must be written to be called from softirq context.  In particular,
        it cannot block.
 6.      Since synchronize_rcu() can block, it cannot be called from
@@ -202,11 +202,12 @@ over a rather long period of time, but improvements are always welcome!
        updater uses call_rcu_sched() or synchronize_sched(), then
        the corresponding readers must disable preemption, possibly
        by calling rcu_read_lock_sched() and rcu_read_unlock_sched().
-        If the updater uses synchronize_srcu(), the the corresponding
+        If the updater uses synchronize_srcu() or call_srcu(),
-        readers must use srcu_read_lock() and srcu_read_unlock(),
+        the the corresponding readers must use srcu_read_lock() and
-        and with the same srcu_struct.  The rules for the expedited
+        srcu_read_unlock(), and with the same srcu_struct.  The rules for
-        primitives are the same as for their non-expedited counterparts.
+        the expedited primitives are the same as for their non-expedited
-        Mixing things up will result in confusion and broken kernels.
+        counterparts.  Mixing things up will result in confusion and
+        broken kernels.
        One exception to this rule: rcu_read_lock() and rcu_read_unlock()
        may be substituted for rcu_read_lock_bh() and rcu_read_unlock_bh()
@@ -333,14 +334,14 @@ over a rather long period of time, but improvements are always welcome!
        victim CPU from ever going offline.)
 14.     SRCU (srcu_read_lock(), srcu_read_unlock(), srcu_dereference(),
-        synchronize_srcu(), and synchronize_srcu_expedited()) may only
+        synchronize_srcu(), synchronize_srcu_expedited(), and call_srcu())
-        be invoked from process context.  Unlike other forms of RCU, it
+        may only be invoked from process context.  Unlike other forms of
-        -is- permissible to block in an SRCU read-side critical section
+        RCU, it -is- permissible to block in an SRCU read-side critical
-        (demarked by srcu_read_lock() and srcu_read_unlock()), hence the
+        section (demarked by srcu_read_lock() and srcu_read_unlock()),
-        "SRCU": "sleepable RCU".  Please note that if you don't need
+        hence the "SRCU": "sleepable RCU".  Please note that if you
-        to sleep in read-side critical sections, you should be using
+        don't need to sleep in read-side critical sections, you should be
-        RCU rather than SRCU, because RCU is almost always faster and
+        using RCU rather than SRCU, because RCU is almost always faster
-        easier to use than is SRCU.
+        and easier to use than is SRCU.
        If you need to enter your read-side critical section in a
        hardirq or exception handler, and then exit that same read-side
@@ -353,8 +354,8 @@ over a rather long period of time, but improvements are always welcome!
        cleanup_srcu_struct().  These are passed a "struct srcu_struct"
        that defines the scope of a given SRCU domain.  Once initialized,
        the srcu_struct is passed to srcu_read_lock(), srcu_read_unlock()
-        synchronize_srcu(), and synchronize_srcu_expedited().  A given
+        synchronize_srcu(), synchronize_srcu_expedited(), and call_srcu().
-        synchronize_srcu() waits only for SRCU read-side critical
+        A given synchronize_srcu() waits only for SRCU read-side critical
        sections governed by srcu_read_lock() and srcu_read_unlock()
        calls that have been passed the same srcu_struct.  This property
        is what makes sleeping read-side critical sections tolerable --
@@ -374,7 +375,7 @@ over a rather long period of time, but improvements are always welcome!
        requiring SRCU's read-side deadlock immunity or low read-side
        realtime latency.
-        Note that, rcu_assign_pointer() relates to SRCU just as they do
+        Note that, rcu_assign_pointer() relates to SRCU just as it does
        to other forms of RCU.
 15.     The whole point of call_rcu(), synchronize_rcu(), and friends
diff --git a/Documentation/RCU/rcubarrier.txt b/Documentation/RCU/rcubarrier.txt
index e439a0edee22..38428c125135 100644
--- a/Documentation/RCU/rcubarrier.txt
+++ b/Documentation/RCU/rcubarrier.txt
@@ -79,8 +79,6 @@ complete. Pseudo-code using rcu_barrier() is as follows:
   2. Execute rcu_barrier().
   3. Allow the module to be unloaded.
-Quick Quiz #1: Why is there no srcu_barrier()?
 The rcutorture module makes use of rcu_barrier in its exit function
 as follows:
@@ -162,7 +160,7 @@ for any pre-existing callbacks to complete.
 Then lines 55-62 print status and do operation-specific cleanup, and
 then return, permitting the module-unload operation to be completed.
-Quick Quiz #2: Is there any other situation where rcu_barrier() might
+Quick Quiz #1: Is there any other situation where rcu_barrier() might
        be required?
 Your module might have additional complications. For example, if your
@@ -242,7 +240,7 @@ reaches zero, as follows:
 4 complete(&rcu_barrier_completion);
 5 }
-Quick Quiz #3: What happens if CPU 0's rcu_barrier_func() executes
+Quick Quiz #2: What happens if CPU 0's rcu_barrier_func() executes
        immediately (thus incrementing rcu_barrier_cpu_count to the
        value one), but the other CPU's rcu_barrier_func() invocations
        are delayed for a full grace period? Couldn't this result in
@@ -259,12 +257,7 @@ so that your module may be safely unloaded.
 Answers to Quick Quizzes
-Quick Quiz #1: Why is there no srcu_barrier()?
+Quick Quiz #1: Is there any other situation where rcu_barrier() might
-Answer: Since there is no call_srcu(), there can be no outstanding SRCU
-        callbacks. Therefore, there is no need to wait for them.
-Quick Quiz #2: Is there any other situation where rcu_barrier() might
        be required?
 Answer: Interestingly enough, rcu_barrier() was not originally
@@ -278,7 +271,7 @@ Answer: Interestingly enough, rcu_barrier() was not originally
        implementing rcutorture, and found that rcu_barrier() solves
        this problem as well.
-Quick Quiz #3: What happens if CPU 0's rcu_barrier_func() executes
+Quick Quiz #2: What happens if CPU 0's rcu_barrier_func() executes
        immediately (thus incrementing rcu_barrier_cpu_count to the
        value one), but the other CPU's rcu_barrier_func() invocations
        are delayed for a full grace period? Couldn't this result in
diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt
index 4ddf3913fd8c..7dce8a17eac2 100644
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
@@ -174,11 +174,20 @@ torture_type	The type of RCU to test, with string values as follows:
                        and synchronize_rcu_bh_expedited().
                "srcu": srcu_read_lock(), srcu_read_unlock() and
+                        call_srcu().
+                "srcu_sync": srcu_read_lock(), srcu_read_unlock() and
                        synchronize_srcu().
                "srcu_expedited": srcu_read_lock(), srcu_read_unlock() and
                        synchronize_srcu_expedited().
+                "srcu_raw": srcu_read_lock_raw(), srcu_read_unlock_raw(),
+                        and call_srcu().
+                "srcu_raw_sync": srcu_read_lock_raw(), srcu_read_unlock_raw(),
+                        and synchronize_srcu().
                "sched": preempt_disable(), preempt_enable(), and
                        call_rcu_sched().
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt
index 6bbe8dcdc3da..69ee188515e7 100644
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
@@ -833,9 +833,9 @@ sched:	Critical sections	Grace period		Barrier
 SRCU:   Critical sections       Grace period            Barrier
-        srcu_read_lock          synchronize_srcu        N/A
+        srcu_read_lock          synchronize_srcu        srcu_barrier
-        srcu_read_unlock        synchronize_srcu_expedited
+        srcu_read_unlock        call_srcu
-        srcu_read_lock_raw
+        srcu_read_lock_raw      synchronize_srcu_expedited
        srcu_read_unlock_raw
        srcu_dereference
diff --git a/Documentation/arm/Samsung-S3C24XX/H1940.txt b/Documentation/arm/Samsung-S3C24XX/H1940.txt
index f4a7b22c8664..b738859b1fc0 100644
--- a/Documentation/arm/Samsung-S3C24XX/H1940.txt
+++ b/Documentation/arm/Samsung-S3C24XX/H1940.txt
@@ -37,4 +37,4 @@ Maintainers
  Thanks to the many others who have also provided support.
-(c) 2005 Ben Dooks
-\ No newline at end of file
+(c) 2005 Ben Dooks
diff --git a/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt b/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt
index 32e1eae6a25f..429390bd4684 100644
--- a/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt
+++ b/Documentation/arm/Samsung-S3C24XX/SMDK2440.txt
@@ -53,4 +53,4 @@ Maintainers
  and to Simtec Electronics for allowing me time to work on this.
-(c) 2004 Ben Dooks
-\ No newline at end of file
+(c) 2004 Ben Dooks
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index d8147b336c35..6518a55273e7 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -38,6 +38,13 @@ read or write requests. Note that the total allocated number may be twice
 this amount, since it applies only to reads or writes (not the accumulated
 sum).
+To avoid priority inversion through request starvation, a request
+queue maintains a separate request pool per each cgroup when
+CONFIG_BLK_CGROUP is enabled, and this parameter applies to each such
+per-block-cgroup request pool.  IOW, if there are N block cgroups,
+each request queue may have upto N request pools, each independently
+regulated by nr_requests.
 read_ahead_kb (RW)
 ------------------
 Maximum number of kilobytes to read-ahead for filesystems on this block
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index 8e74980ab385..4a0b64c605fc 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -370,15 +370,12 @@ To mount a cgroup hierarchy with just the cpuset and memory
 subsystems, type:
 # mount -t cgroup -o cpuset,memory hier1 /sys/fs/cgroup/rg1
-To change the set of subsystems bound to a mounted hierarchy, just
+While remounting cgroups is currently supported, it is not recommend
-remount with different options:
+to use it. Remounting allows changing bound subsystems and
-# mount -o remount,cpuset,blkio hier1 /sys/fs/cgroup/rg1
+release_agent. Rebinding is hardly useful as it only works when the
+hierarchy is empty and release_agent itself should be replaced with
-Now memory is removed from the hierarchy and blkio is added.
+conventional fsnotify. The support for remounting will be removed in
+the future.
-Note this will add blkio to the hierarchy but won't remove memory or
-cpuset, because the new options are appended to the old ones:
-# mount -o remount,blkio /sys/fs/cgroup/rg1
 To Specify a hierarchy's release_agent:
 # mount -t cgroup -o cpuset,release_agent="/sbin/cpuset_release_agent" \
@@ -637,16 +634,6 @@ void exit(struct task_struct *task)
 Called during task exit.
-int populate(struct cgroup *cgrp)
-(cgroup_mutex held by caller)
-Called after creation of a cgroup to allow a subsystem to populate
-the cgroup directory with file entries.  The subsystem should make
-calls to cgroup_add_file() with objects of type cftype (see
-include/linux/cgroup.h for details).  Note that although this
-method can return an error code, the error code is currently not
-always handled well.
 void post_clone(struct cgroup *cgrp)
 (cgroup_mutex held by caller)
@@ -656,7 +643,7 @@ example in cpusets, no task may attach before 'cpus' and 'mems' are set
 up.
 void bind(struct cgroup *root)
-(cgroup_mutex and ss->hierarchy_mutex held by caller)
+(cgroup_mutex held by caller)
 Called when a cgroup subsystem is rebound to a different hierarchy
 and root cgroup. Currently this will only involve movement between
diff --git a/Documentation/cgroups/hugetlb.txt b/Documentation/cgroups/hugetlb.txt
new file mode 100644
index 000000000000..a9faaca1f029
--- /dev/null
+++ b/Documentation/cgroups/hugetlb.txt
@@ -0,0 +1,45 @@
+HugeTLB Controller
+-------------------
+The HugeTLB controller allows to limit the HugeTLB usage per control group and
+enforces the controller limit during page fault. Since HugeTLB doesn't
+support page reclaim, enforcing the limit at page fault time implies that,
+the application will get SIGBUS signal if it tries to access HugeTLB pages
+beyond its limit. This requires the application to know beforehand how much
+HugeTLB pages it would require for its use.
+HugeTLB controller can be created by first mounting the cgroup filesystem.
+# mount -t cgroup -o hugetlb none /sys/fs/cgroup
+With the above step, the initial or the parent HugeTLB group becomes
+visible at /sys/fs/cgroup. At bootup, this group includes all the tasks in
+the system. /sys/fs/cgroup/tasks lists the tasks in this cgroup.
+New groups can be created under the parent group /sys/fs/cgroup.
+# cd /sys/fs/cgroup
+# mkdir g1
+# echo $$ > g1/tasks
+The above steps create a new group g1 and move the current shell
+process (bash) into it.
+Brief summary of control files
+ hugetlb.<hugepagesize>.limit_in_bytes     # set/show limit of "hugepagesize" hugetlb usage
+ hugetlb.<hugepagesize>.max_usage_in_bytes # show max "hugepagesize" hugetlb  usage recorded
+ hugetlb.<hugepagesize>.usage_in_bytes     # show current res_counter usage for "hugepagesize" hugetlb
+ hugetlb.<hugepagesize>.failcnt            # show the number of allocation failure due to HugeTLB limit
+For a system supporting two hugepage size (16M and 16G) the control
+files include:
+hugetlb.16GB.limit_in_bytes
+hugetlb.16GB.max_usage_in_bytes
+hugetlb.16GB.usage_in_bytes
+hugetlb.16GB.failcnt
+hugetlb.16MB.limit_in_bytes
+hugetlb.16MB.max_usage_in_bytes
+hugetlb.16MB.usage_in_bytes
+hugetlb.16MB.failcnt
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt
index dd88540bb995..4372e6b8a353 100644
--- a/Documentation/cgroups/memory.txt
+++ b/Documentation/cgroups/memory.txt
@@ -73,6 +73,8 @@ Brief summary of control files.
 memory.kmem.tcp.limit_in_bytes  # set/show hard limit for tcp buf memory
 memory.kmem.tcp.usage_in_bytes  # show current tcp buf memory allocation
+ memory.kmem.tcp.failcnt            # show the number of tcp buf memory usage hits limits
+ memory.kmem.tcp.max_usage_in_bytes # show max tcp buf memory usage recorded
 1. History
@@ -187,12 +189,12 @@ the cgroup that brought it in -- this will happen on memory pressure).
 But see section 8.2: when moving a task to another cgroup, its pages may
 be recharged to the new cgroup, if move_charge_at_immigrate has been chosen.
-Exception: If CONFIG_CGROUP_CGROUP_MEM_RES_CTLR_SWAP is not used.
+Exception: If CONFIG_CGROUP_CGROUP_MEMCG_SWAP is not used.
 When you do swapoff and make swapped-out pages of shmem(tmpfs) to
 be backed into memory in force, charges for pages are accounted against the
 caller of swapoff rather than the users of shmem.
-2.4 Swap Extension (CONFIG_CGROUP_MEM_RES_CTLR_SWAP)
+2.4 Swap Extension (CONFIG_MEMCG_SWAP)
 Swap Extension allows you to record charge for swap. A swapped-in page is
 charged back to original page allocator if possible.
@@ -259,7 +261,7 @@ When oom event notifier is registered, event will be delivered.
  per-zone-per-cgroup LRU (cgroup's private LRU) is just guarded by
  zone->lru_lock, it has no lock of its own.
-2.7 Kernel Memory Extension (CONFIG_CGROUP_MEM_RES_CTLR_KMEM)
+2.7 Kernel Memory Extension (CONFIG_MEMCG_KMEM)
 With the Kernel memory extension, the Memory Controller is able to limit
 the amount of kernel memory used by the system. Kernel memory is fundamentally
@@ -286,8 +288,8 @@ per cgroup, instead of globally.
 a. Enable CONFIG_CGROUPS
 b. Enable CONFIG_RESOURCE_COUNTERS
-c. Enable CONFIG_CGROUP_MEM_RES_CTLR
+c. Enable CONFIG_MEMCG
-d. Enable CONFIG_CGROUP_MEM_RES_CTLR_SWAP (to use swap extension)
+d. Enable CONFIG_MEMCG_SWAP (to use swap extension)
 1. Prepare the cgroups (see cgroups.txt, Why are cgroups needed?)
 # mount -t tmpfs none /sys/fs/cgroup
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
index 7764594778d4..adcca0368d60 100644
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
@@ -69,9 +69,13 @@ static int cn_test_want_notify(void)
                return -ENOMEM;
        }
-        nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh));
+        nlh = nlmsg_put(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh), 0);
+        if (!nlh) {
+                kfree_skb(skb);
+                return -EMSGSIZE;
+        }
-        msg = (struct cn_msg *)NLMSG_DATA(nlh);
+        msg = nlmsg_data(nlh);
        memset(msg, 0, size0);
@@ -117,11 +121,6 @@ static int cn_test_want_notify(void)
        pr_info("request was sent: group=0x%x\n", ctl->group);
        return 0;
-nlmsg_failure:
-        pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
-        kfree_skb(skb);
-        return -EINVAL;
 }
 #endif
diff --git a/Documentation/device-mapper/dm-raid.txt b/Documentation/device-mapper/dm-raid.txt
index 946c73342cde..1c1844957166 100644
--- a/Documentation/device-mapper/dm-raid.txt
+++ b/Documentation/device-mapper/dm-raid.txt
@@ -27,6 +27,10 @@ The target is named "raid" and it accepts the following parameters:
                - rotating parity N (right-to-left) with data restart
  raid6_nc      RAID6 N continue
                - rotating parity N (right-to-left) with data continuation
+  raid10        Various RAID10 inspired algorithms chosen by additional params
+                - RAID10: Striped Mirrors (aka 'Striping on top of mirrors')
+                - RAID1E: Integrated Adjacent Stripe Mirroring
+                -  and other similar RAID10 variants
  Reference: Chapter 4 of
  http://www.snia.org/sites/default/files/SNIA_DDF_Technical_Position_v2.0.pdf
@@ -59,6 +63,28 @@ The target is named "raid" and it accepts the following parameters:
                logical size of the array.  The bitmap records the device
                synchronisation state for each region.
+        [raid10_copies   <# copies>]
+        [raid10_format   near]
+                These two options are used to alter the default layout of
+                a RAID10 configuration.  The number of copies is can be
+                specified, but the default is 2.  There are other variations
+                to how the copies are laid down - the default and only current
+                option is "near".  Near copies are what most people think of
+                with respect to mirroring.  If these options are left
+                unspecified, or 'raid10_copies 2' and/or 'raid10_format near'
+                are given, then the layouts for 2, 3 and 4 devices are:
+                2 drives         3 drives          4 drives
+                --------         ----------        --------------
+                A1  A1           A1  A1  A2        A1  A1  A2  A2
+                A2  A2           A2  A3  A3        A3  A3  A4  A4
+                A3  A3           A4  A4  A5        A5  A5  A6  A6
+                A4  A4           A5  A6  A6        A7  A7  A8  A8
+                ..  ..           ..  ..  ..        ..  ..  ..  ..
+                The 2-device layout is equivalent 2-way RAID1.  The 4-device
+                layout is what a traditional RAID10 would look like.  The
+                3-device layout is what might be called a 'RAID1E - Integrated
+                Adjacent Stripe Mirroring'.
 <#raid_devs>: The number of devices composing the array.
        Each device consists of two entries.  The first is the device
        containing the metadata (if any); the second is the one containing the
diff --git a/Documentation/device-mapper/striped.txt b/Documentation/device-mapper/striped.txt
index f34d3236b9da..45f3b91ea4c3 100644
--- a/Documentation/device-mapper/striped.txt
+++ b/Documentation/device-mapper/striped.txt
@@ -9,15 +9,14 @@ devices in parallel.
 Parameters: <num devs> <chunk size> [<dev path> <offset>]+
    <num devs>: Number of underlying devices.
-    <chunk size>: Size of each chunk of data. Must be a power-of-2 and at
+    <chunk size>: Size of each chunk of data. Must be at least as
-                  least as large as the system's PAGE_SIZE.
+                  large as the system's PAGE_SIZE.
    <dev path>: Full pathname to the underlying block-device, or a
                "major:minor" device-number.
    <offset>: Starting sector within the device.
 One or more underlying devices can be specified. The striped device size must
-be a multiple of the chunk size and a multiple of the number of underlying
+be a multiple of the chunk size multiplied by the number of underlying devices.
-devices.
 Example scripts
diff --git a/Documentation/device-mapper/thin-provisioning.txt b/Documentation/device-mapper/thin-provisioning.txt
index f5cfc62b7ad3..30b8b83bd333 100644
--- a/Documentation/device-mapper/thin-provisioning.txt
+++ b/Documentation/device-mapper/thin-provisioning.txt
@@ -231,6 +231,9 @@ i) Constructor
      no_discard_passdown: Don't pass discards down to the underlying
                           data device, but just remove the mapping.
+      read_only: Don't allow any changes to be made to the pool
+                 metadata.
    Data block size must be between 64KB (128 sectors) and 1GB
    (2097152 sectors) inclusive.
@@ -239,7 +242,7 @@ ii) Status
    <transaction id> <used metadata blocks>/<total metadata blocks>
    <used data blocks>/<total data blocks> <held metadata root>
+    [no_]discard_passdown ro|rw
    transaction id:
        A 64-bit number used by userspace to help synchronise with metadata
@@ -257,6 +260,21 @@ ii) Status
        held root.  This feature is not yet implemented so '-' is
        always returned.
+    discard_passdown|no_discard_passdown
+        Whether or not discards are actually being passed down to the
+        underlying device.  When this is enabled when loading the table,
+        it can get disabled if the underlying device doesn't support it.
+    ro|rw
+        If the pool encounters certain types of device failures it will
+        drop into a read-only metadata mode in which no changes to
+        the pool metadata (like allocating new blocks) are permitted.
+        In serious cases where even a read-only mode is deemed unsafe
+        no further I/O will be permitted and the status will just
+        contain the string 'Fail'.  The userspace recovery tools
+        should then be used.
 iii) Messages
    create_thin <dev id>
@@ -329,3 +347,7 @@ regain some space then send the 'trim' message to the pool.
 ii) Status
     <nr mapped sectors> <highest mapped sector>
+        If the pool has encountered device errors and failed, the status
+        will just contain the string 'Fail'.  The userspace recovery
+        tools should then be used.
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index 47a154f30290..b6251cca9263 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -2416,6 +2416,8 @@ Your cooperation is appreciated.
                  1 = /dev/raw/raw1     First raw I/O device
                  2 = /dev/raw/raw2     Second raw I/O device
                    ...
+                 max minor number of raw device is set by kernel config
+                 MAX_RAW_DEVS or raw module parameter 'max_raw_devs'
 163 char
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt
new file mode 100644
index 000000000000..70c0dc5f00ed
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt
@@ -0,0 +1,23 @@
+Marvell Armada 370 and Armada XP Interrupt Controller
+-----------------------------------------------------
+Required properties:
+- compatible: Should be "marvell,mpic"
+- interrupt-controller: Identifies the node as an interrupt controller.
+- #interrupt-cells: The number of cells to define the interrupts. Should be 1.
+  The cell is the IRQ number
+- reg: Should contain PMIC registers location and length. First pair
+  for the main interrupt registers, second pair for the per-CPU
+  interrupt registers
+Example:
+        mpic: interrupt-controller@d0020000 {
+              compatible = "marvell,mpic";
+              #interrupt-cells = <1>;
+              #address-cells = <1>;
+              #size-cells = <1>;
+              interrupt-controller;
+              reg = <0xd0020000 0x1000>,
+                    <0xd0021000 0x1000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt
new file mode 100644
index 000000000000..8b6ea2267c94
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt
@@ -0,0 +1,11 @@
+Marvell Armada 370 and Armada XP Global Timers
+----------------------------------------------
+Required properties:
+- compatible: Should be "marvell,armada-370-xp-timer"
+- interrupts: Should contain the list of Global Timer interrupts
+- reg: Should contain the base address of the Global Timer registers
+Optional properties:
+- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
+  Mhz fixed mode (available on Armada XP and not on Armada 370)
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp.txt b/Documentation/devicetree/bindings/arm/armada-370-xp.txt
new file mode 100644
index 000000000000..c6ed90ea6e17
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/armada-370-xp.txt
@@ -0,0 +1,24 @@
+Marvell Armada 370 and Armada XP Platforms Device Tree Bindings
+---------------------------------------------------------------
+Boards with a SoC of the Marvell Armada 370 and Armada XP families
+shall have the following property:
+Required root node property:
+compatible: must contain "marvell,armada-370-xp"
+In addition, boards using the Marvell Armada 370 SoC shall have the
+following property:
+Required root node property:
+compatible: must contain "marvell,armada370"
+In addition, boards using the Marvell Armada XP SoC shall have the
+following property:
+Required root node property:
+compatible: must contain "marvell,armadaxp"
diff --git a/Documentation/devicetree/bindings/arm/atmel-aic.txt b/Documentation/devicetree/bindings/arm/atmel-aic.txt
index aabca4f83402..19078bf5cca8 100644
--- a/Documentation/devicetree/bindings/arm/atmel-aic.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-aic.txt
@@ -4,7 +4,7 @@ Required properties:
 - compatible: Should be "atmel,<chip>-aic"
 - interrupt-controller: Identifies the node as an interrupt controller.
 - interrupt-parent: For single AIC system, it is an empty property.
- #interrupt-cells: The number of cells to define the interrupts. It sould be 2.
+- #interrupt-cells: The number of cells to define the interrupts. It sould be 3.
  The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).
  The second cell is used to specify flags:
    bits[3:0] trigger type and level flags:
@@ -14,7 +14,10 @@ Required properties:
      8 = active low level-sensitive.
      Valid combinations are 1, 2, 3, 4, 8.
      Default flag for internal sources should be set to 4 (active high).
+  The third cell is used to specify the irq priority from 0 (lowest) to 7
+  (highest).
 - reg: Should contain AIC registers location and length
+- atmel,external-irqs: u32 array of external irqs.
 Examples:
        /*
@@ -24,7 +27,7 @@ Examples:
                compatible = "atmel,at91rm9200-aic";
                interrupt-controller;
                interrupt-parent;
-                #interrupt-cells = <2>;
+                #interrupt-cells = <3>;
                reg = <0xfffff000 0x200>;
        };
@@ -34,5 +37,5 @@ Examples:
        dma: dma-controller@ffffec00 {
                compatible = "atmel,at91sam9g45-dma";
                reg = <0xffffec00 0x200>;
-                interrupts = <21 4>;
+                interrupts = <21 4 5>;
        };
diff --git a/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt b/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt
new file mode 100644
index 000000000000..94e642a33db0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt
@@ -0,0 +1,15 @@
+Calxeda Highbank L2 cache ECC
+Properties:
+- compatible : Should be "calxeda,hb-sregs-l2-ecc"
+- reg : Address and size for ECC error interrupt clear registers.
+- interrupts : Should be single bit error interrupt, then double bit error
+        interrupt.
+Example:
+        sregs@fff3c200 {
+                compatible = "calxeda,hb-sregs-l2-ecc";
+                reg = <0xfff3c200 0x100>;
+                interrupts = <0 71 4  0 72 4>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
new file mode 100644
index 000000000000..f770ac0893d4
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
@@ -0,0 +1,14 @@
+Calxeda DDR memory controller
+Properties:
+- compatible : Should be "calxeda,hb-ddr-ctrl"
+- reg : Address and size for DDR controller registers.
+- interrupts : Interrupt for DDR controller.
+Example:
+        memory-controller@fff00000 {
+                compatible = "calxeda,hb-ddr-ctrl";
+                reg = <0xfff00000 0x1000>;
+                interrupts = <0 91 4>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/davinci/cp-intc.txt b/Documentation/devicetree/bindings/arm/davinci/cp-intc.txt
new file mode 100644
index 000000000000..597e8a089fe4
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/davinci/cp-intc.txt
@@ -0,0 +1,27 @@
+* TI Common Platform Interrupt Controller
+Common Platform Interrupt Controller (cp_intc) is used on
+OMAP-L1x SoCs and can support several configurable number
+of interrupts.
+Main node required properties:
+- compatible : should be:
+        "ti,cp-intc"
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt source. The type shall be a <u32> and the value shall be 1.
+  The cell contains the interrupt number in the range [0-128].
+- ti,intc-size: Number of interrupts handled by the interrupt controller.
+- reg: physical base address and size of the intc registers map.
+Example:
+        intc: interrupt-controller@1 {
+                compatible = "ti,cp-intc";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                ti,intc-size = <101>;
+                reg = <0xfffee000 0x2000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/mrvl/intc.txt b/Documentation/devicetree/bindings/arm/mrvl/intc.txt
index 80b9a94d9a23..8b53273cb22f 100644
--- a/Documentation/devicetree/bindings/arm/mrvl/intc.txt
+++ b/Documentation/devicetree/bindings/arm/mrvl/intc.txt
@@ -38,3 +38,23 @@ Example:
                reg-names = "mux status", "mux mask";
                mrvl,intc-nr-irqs = <2>;
        };
+* Marvell Orion Interrupt controller
+Required properties
+- compatible :  Should be "marvell,orion-intc".
+- #interrupt-cells: Specifies the number of cells needed to encode an
+  interrupt source. Supported value is <1>.
+- interrupt-controller : Declare this node to be an interrupt controller.
+- reg : Interrupt mask address. A list of 4 byte ranges, one per controller.
+        One entry in the list represents 32 interrupts.
+Example:
+        intc: interrupt-controller {
+                compatible = "marvell,orion-intc", "marvell,intc";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                reg = <0xfed20204 0x04>,
+                      <0xfed20214 0x04>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
new file mode 100644
index 000000000000..081c6a786c8a
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mvebu-system-controller.txt
@@ -0,0 +1,17 @@
+MVEBU System Controller
+-----------------------
+MVEBU (Marvell SOCs: Armada 370/XP, Dove, mv78xx0, Kirkwood, Orion5x)
+Required properties:
+- compatible: one of:
+        - "marvell,orion-system-controller"
+        - "marvell,armada-370-xp-system-controller"
+- reg: Should contain system controller registers location and length.
+Example:
+        system-controller@d0018200 {
+                compatible = "marvell,armada-370-xp-system-controller";
+                reg = <0xd0018200 0x500>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/olimex.txt b/Documentation/devicetree/bindings/arm/olimex.txt
new file mode 100644
index 000000000000..007fb5c685a1
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/olimex.txt
@@ -0,0 +1,6 @@
+Olimex i.MX Platforms Device Tree Bindings
+------------------------------------------
+i.MX23 Olinuxino Low Cost Board
+Required root node properties:
+    - compatible = "olimex,imx23-olinuxino", "fsl,imx23";
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index e78e8bccac30..ccdd0e53451f 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -47,3 +47,9 @@ Boards:
 - AM335X EVM : Software Developement Board for AM335x
  compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3"
+- AM335X Bone : Low cost community board
+  compatible = "ti,am335x-bone", "ti,am33xx", "ti,omap3"
+- OMAP5 EVM : Evaluation Module
+  compatible = "ti,omap5-evm", "ti,omap5"
diff --git a/Documentation/devicetree/bindings/arm/primecell.txt b/Documentation/devicetree/bindings/arm/primecell.txt
index 951ca46789d4..64fc82bc8928 100644
--- a/Documentation/devicetree/bindings/arm/primecell.txt
+++ b/Documentation/devicetree/bindings/arm/primecell.txt
@@ -13,11 +13,17 @@ Required properties:
 Optional properties:
 - arm,primecell-periphid : Value to override the h/w value with
+- clocks : From common clock binding. First clock is phandle to clock for apb
+        pclk. Additional clocks are optional and specific to those peripherals.
+- clock-names : From common clock binding. Shall be "apb_pclk" for first clock.
 Example:
 serial@fff36000 {
        compatible = "arm,pl011", "arm,primecell";
        arm,primecell-periphid = <0x00341011>;
+        clocks = <&pclk>;
+        clock-names = "apb_pclk";
+        
 };
diff --git a/Documentation/devicetree/bindings/arm/tegra/emc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt
index 09335f8eee00..4c33b29dc660 100644
--- a/Documentation/devicetree/bindings/arm/tegra/emc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-emc.txt
@@ -15,7 +15,7 @@ Child device nodes describe the memory settings for different configurations and
 Example:
-        emc@7000f400 {
+        memory-controller@7000f400 {
                #address-cells = < 1 >;
                #size-cells = < 0 >;
                compatible = "nvidia,tegra20-emc";
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
index c25a0a55151d..866d93421eba 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 Example:
-        mc {
+        memory-controller@0x7000f000 {
                compatible = "nvidia,tegra20-mc";
                reg = <0x7000f000 0x024
                       0x7000f03c 0x3c4>;
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
index e47e73f612f4..bdf1a612422b 100644
--- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 Example:
-        mc {
+        memory-controller {
                compatible = "nvidia,tegra30-mc";
                reg = <0x7000f000 0x010
                       0x7000f03c 0x1b4
diff --git a/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt b/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt
new file mode 100644
index 000000000000..93986a5a8018
--- /dev/null
+++ b/Documentation/devicetree/bindings/ata/cavium-compact-flash.txt
@@ -0,0 +1,30 @@
+* Compact Flash
+The Cavium Compact Flash device is connected to the Octeon Boot Bus,
+and is thus a child of the Boot Bus device.  It can read and write
+industry standard compact flash devices.
+Properties:
+- compatible: "cavium,ebt3000-compact-flash";
+  Compatibility with many Cavium evaluation boards.
+- reg: The base address of the the CF chip select banks.  Depending on
+  the device configuration, there may be one or two banks.
+- cavium,bus-width: The width of the connection to the CF devices.  Valid
+  values are 8 and 16.
+- cavium,true-ide: Optional, if present the CF connection is in True IDE mode.
+- cavium,dma-engine-handle: Optional, a phandle for the DMA Engine connected
+  to this device.
+Example:
+        compact-flash@5,0 {
+                compatible = "cavium,ebt3000-compact-flash";
+                reg = <5 0 0x10000>, <6 0 0x10000>;
+                cavium,bus-width = <16>;
+                cavium,true-ide;
+                cavium,dma-engine-handle = <&dma0>;
+        };
diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt
new file mode 100644
index 000000000000..b5cdd20cde9c
--- /dev/null
+++ b/Documentation/devicetree/bindings/ata/marvell.txt
@@ -0,0 +1,16 @@
+* Marvell Orion SATA
+Required Properties:
+- compatibility : "marvell,orion-sata"
+- reg           : Address range of controller
+- interrupts    : Interrupt controller is using
+- nr-ports      : Number of SATA ports in use.
+Example:
+        sata@80000 {
+                compatible = "marvell,orion-sata";
+                reg = <0x80000 0x5000>;
+                interrupts = <21>;
+                nr-ports = <2>;
+        }
diff --git a/Documentation/devicetree/bindings/clock/calxeda.txt b/Documentation/devicetree/bindings/clock/calxeda.txt
new file mode 100644
index 000000000000..0a6ac1bdcda1
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/calxeda.txt
@@ -0,0 +1,17 @@
+Device Tree Clock bindings for Calxeda highbank platform
+This binding uses the common clock binding[1].
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+Required properties:
+- compatible : shall be one of the following:
+        "calxeda,hb-pll-clock" - for a PLL clock
+        "calxeda,hb-a9periph-clock" - The A9 peripheral clock divided from the
+                A9 clock.
+        "calxeda,hb-a9bus-clock" - The A9 bus clock divided from the A9 clock.
+        "calxeda,hb-emmc-clock" - Divided clock for MMC/SD controller.
+- reg : shall be the control register offset from SYSREGs base for the clock.
+- clocks : shall be the input parent clock phandle for the clock. This is
+        either an oscillator or a pll output.
+- #clock-cells : from common clock binding; shall be set to 0.
diff --git a/Documentation/devicetree/bindings/clock/clock-bindings.txt b/Documentation/devicetree/bindings/clock/clock-bindings.txt
new file mode 100644
index 000000000000..eb65d417f8c4
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -0,0 +1,117 @@
+This binding is a work-in-progress, and are based on some experimental
+work by benh[1].
+Sources of clock signal can be represented by any node in the device
+tree.  Those nodes are designated as clock providers.  Clock consumer
+nodes use a phandle and clock specifier pair to connect clock provider
+outputs to clock inputs.  Similar to the gpio specifiers, a clock
+specifier is an array of one more more cells identifying the clock
+output on a device.  The length of a clock specifier is defined by the
+value of a #clock-cells property in the clock provider node.
+[1] http://patchwork.ozlabs.org/patch/31551/
+==Clock providers==
+Required properties:
+#clock-cells:      Number of cells in a clock specifier; Typically 0 for nodes
+                   with a single clock output and 1 for nodes with multiple
+                   clock outputs.
+Optional properties:
+clock-output-names: Recommended to be a list of strings of clock output signal
+                    names indexed by the first cell in the clock specifier.
+                    However, the meaning of clock-output-names is domain
+                    specific to the clock provider, and is only provided to
+                    encourage using the same meaning for the majority of clock
+                    providers.  This format may not work for clock providers
+                    using a complex clock specifier format.  In those cases it
+                    is recommended to omit this property and create a binding
+                    specific names property.
+                    Clock consumer nodes must never directly reference
+                    the provider's clock-output-names property.
+For example:
+    oscillator {
+        #clock-cells = <1>;
+        clock-output-names = "ckil", "ckih";
+    };
+- this node defines a device with two clock outputs, the first named
+  "ckil" and the second named "ckih".  Consumer nodes always reference
+  clocks by index. The names should reflect the clock output signal
+  names for the device.
+==Clock consumers==
+Required properties:
+clocks:         List of phandle and clock specifier pairs, one pair
+                for each clock input to the device.  Note: if the
+                clock provider specifies '0' for #clock-cells, then
+                only the phandle portion of the pair will appear.
+Optional properties:
+clock-names:    List of clock input name strings sorted in the same
+                order as the clocks property.  Consumers drivers
+                will use clock-names to match clock input names
+                with clocks specifiers.
+clock-ranges:   Empty property indicating that child nodes can inherit named
+                clocks from this node. Useful for bus nodes to provide a
+                clock to their children.
+For example:
+    device {
+        clocks = <&osc 1>, <&ref 0>;
+        clock-names = "baud", "register";
+    };
+This represents a device with two clock inputs, named "baud" and "register".
+The baud clock is connected to output 1 of the &osc device, and the register
+clock is connected to output 0 of the &ref.
+==Example==
+    /* external oscillator */
+    osc: oscillator {
+        compatible = "fixed-clock";
+        #clock-cells = <1>;
+        clock-frequency  = <32678>;
+        clock-output-names = "osc";
+    };
+    /* phase-locked-loop device, generates a higher frequency clock
+     * from the external oscillator reference */
+    pll: pll@4c000 {
+        compatible = "vendor,some-pll-interface"
+        #clock-cells = <1>;
+        clocks = <&osc 0>;
+        clock-names = "ref";
+        reg = <0x4c000 0x1000>;
+        clock-output-names = "pll", "pll-switched";
+    };
+    /* UART, using the low frequency oscillator for the baud clock,
+     * and the high frequency switched PLL output for register
+     * clocking */
+    uart@a000 {
+        compatible = "fsl,imx-uart";
+        reg = <0xa000 0x1000>;
+        interrupts = <33>;
+        clocks = <&osc 0>, <&pll 1>;
+        clock-names = "baud", "register";
+    };
+This DT fragment defines three devices: an external oscillator to provide a
+low-frequency reference clock, a PLL device to generate a higher frequency
+clock signal, and a UART.
+* The oscillator is fixed-frequency, and provides one clock output, named "osc".
+* The PLL is both a clock provider and a clock consumer. It uses the clock
+  signal generated by the external oscillator, and provides two output signals
+  ("pll" and "pll-switched").
+* The UART has its baud clock connected the external oscillator and its
+  register clock connected to the PLL clock (the "pll-switched" signal)
diff --git a/Documentation/devicetree/bindings/clock/fixed-clock.txt b/Documentation/devicetree/bindings/clock/fixed-clock.txt
new file mode 100644
index 000000000000..0b1fe7824093
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/fixed-clock.txt
@@ -0,0 +1,21 @@
+Binding for simple fixed-rate clock sources.
+This binding uses the common clock binding[1].
+[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
+Required properties:
+- compatible : shall be "fixed-clock".
+- #clock-cells : from common clock binding; shall be set to 0.
+- clock-frequency : frequency of clock in Hz. Should be a single cell.
+Optional properties:
+- gpios : From common gpio binding; gpio connection to clock enable pin.
+- clock-output-names : From common clock binding.
+Example:
+        clock {
+                compatible = "fixed-clock";
+                #clock-cells = <0>;
+                clock-frequency = <1000000000>;
+        };
diff --git a/Documentation/devicetree/bindings/fb/mxsfb.txt b/Documentation/devicetree/bindings/fb/mxsfb.txt
new file mode 100644
index 000000000000..b41e5e52a676
--- /dev/null
+++ b/Documentation/devicetree/bindings/fb/mxsfb.txt
@@ -0,0 +1,19 @@
+* Freescale MXS LCD Interface (LCDIF)
+Required properties:
+- compatible: Should be "fsl,<chip>-lcdif".  Supported chips include
+  imx23 and imx28.
+- reg: Address and length of the register set for lcdif
+- interrupts: Should contain lcdif interrupts
+Optional properties:
+- panel-enable-gpios : Should specify the gpio for panel enable
+Examples:
+lcdif@80030000 {
+        compatible = "fsl,imx28-lcdif";
+        reg = <0x80030000 2000>;
+        interrupts = <38 86>;
+        panel-enable-gpios = <&gpio3 30 0>;
+};
diff --git a/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt b/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt
new file mode 100644
index 000000000000..9d6dcd3fe7f9
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/cavium-octeon-gpio.txt
@@ -0,0 +1,49 @@
+* General Purpose Input Output (GPIO) bus.
+Properties:
+- compatible: "cavium,octeon-3860-gpio"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the GPIO unit's register bank.
+- gpio-controller: This is a GPIO controller.
+- #gpio-cells: Must be <2>.  The first cell is the GPIO pin.
+- interrupt-controller: The GPIO controller is also an interrupt
+  controller, many of its pins may be configured as an interrupt
+  source.
+- #interrupt-cells: Must be <2>.  The first cell is the GPIO pin
+   connected to the interrupt source.  The second cell is the interrupt
+   triggering protocol and may have one of four values:
+   1 - edge triggered on the rising edge.
+   2 - edge triggered on the falling edge
+   4 - level triggered active high.
+   8 - level triggered active low.
+- interrupts: Interrupt routing for each pin.
+Example:
+        gpio-controller@1070000000800 {
+                #gpio-cells = <2>;
+                compatible = "cavium,octeon-3860-gpio";
+                reg = <0x10700 0x00000800 0x0 0x100>;
+                gpio-controller;
+                /* Interrupts are specified by two parts:
+                 * 1) GPIO pin number (0..15)
+                 * 2) Triggering (1 - edge rising
+                 *                2 - edge falling
+                 *                4 - level active high
+                 *                8 - level active low)
+                 */
+                interrupt-controller;
+                #interrupt-cells = <2>;
+                /* The GPIO pin connect to 16 consecutive CUI bits */
+                interrupts = <0 16>, <0 17>, <0 18>, <0 19>,
+                             <0 20>, <0 21>, <0 22>, <0 23>,
+                             <0 24>, <0 25>, <0 26>, <0 27>,
+                             <0 28>, <0 29>, <0 30>, <0 31>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
index 4363ae4b3c14..dbd22e0df21e 100644
--- a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt
@@ -8,15 +8,25 @@ Required properties:
  by low 16 pins and the second one is for high 16 pins.
 - gpio-controller : Marks the device node as a gpio controller.
 - #gpio-cells : Should be two.  The first cell is the pin number and
-  the second cell is used to specify optional parameters (currently
+  the second cell is used to specify the gpio polarity:
-  unused).
+      0 = active high
+      1 = active low
+- interrupt-controller: Marks the device node as an interrupt controller.
+- #interrupt-cells : Should be 2.  The first cell is the GPIO number.
+  The second cell bits[3:0] is used to specify trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
 Example:
 gpio0: gpio@73f84000 {
-        compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+        compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
        reg = <0x73f84000 0x4000>;
        interrupts = <50 51>;
        gpio-controller;
        #gpio-cells = <2>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
 };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-mxs.txt b/Documentation/devicetree/bindings/gpio/gpio-mxs.txt
index 0c35673f7a3e..1e677a47b836 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-mxs.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-mxs.txt
@@ -13,8 +13,9 @@ Required properties for GPIO node:
 - interrupts : Should be the port interrupt shared by all 32 pins.
 - gpio-controller : Marks the device node as a gpio controller.
 - #gpio-cells : Should be two.  The first cell is the pin number and
-  the second cell is used to specify optional parameters (currently
+  the second cell is used to specify the gpio polarity:
-  unused).
+      0 = active high
+      1 = active low
 - interrupt-controller: Marks the device node as an interrupt controller.
 - #interrupt-cells : Should be 2.  The first cell is the GPIO number.
  The second cell bits[3:0] is used to specify trigger type and level flags:
diff --git a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
index ee87467ad8d6..8315ac7780ef 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-nmk.txt
@@ -26,6 +26,6 @@ Example:
                        #gpio-cells = <2>;
                        gpio-controller;
                        interrupt-controller;
-                        supports-sleepmode;
+                        st,supports-sleepmode;
                        gpio-bank = <1>;
                };
diff --git a/Documentation/devicetree/bindings/gpio/gpio-samsung.txt b/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
index 8f50fe5e6c42..5375625e8cd2 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
@@ -11,14 +11,15 @@ Required properties:
     <[phandle of the gpio controller node]
      [pin number within the gpio controller]
      [mux function]
-      [pull up/down]
+      [flags and pull up/down]
      [drive strength]>
  Values for gpio specifier:
  - Pin number: is a value between 0 to 7.
-  - Pull Up/Down: 0 - Pull Up/Down Disabled.
+  - Flags and Pull Up/Down: 0 - Pull Up/Down Disabled.
-                  1 - Pull Down Enabled.
+                            1 - Pull Down Enabled.
-                  3 - Pull Up Enabled.
+                            3 - Pull Up Enabled.
+          Bit 16 (0x00010000) - Input is active low.
  - Drive Strength: 0 - 1x,
                    1 - 3x,
                    2 - 2x,
diff --git a/Documentation/devicetree/bindings/gpio/led.txt b/Documentation/devicetree/bindings/gpio/led.txt
index fd2bd56e7195..9bb308abd221 100644
--- a/Documentation/devicetree/bindings/gpio/led.txt
+++ b/Documentation/devicetree/bindings/gpio/led.txt
@@ -55,4 +55,4 @@ run-control {
                gpios = <&mpc8572 7 0>;
                default-state = "on";
        };
-}
+};
diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
index 05428f39d9ac..e13787498bcf 100644
--- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
@@ -27,3 +27,26 @@ Example:
                interrupt-controller;
                #interrupt-cells = <1>;
      };
+* Marvell Orion GPIO Controller
+Required properties:
+- compatible         : Should be "marvell,orion-gpio"
+- reg                : Address and length of the register set for controller.
+- gpio-controller    : So we know this is a gpio controller.
+- ngpio              : How many gpios this controller has.
+- interrupts         : Up to 4 Interrupts for the controller.
+Optional properties:
+- mask-offset        : For SMP Orions, offset for Nth CPU
+Example:
+                gpio0: gpio@10100 {
+                        compatible = "marvell,orion-gpio";
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        reg = <0x10100 0x40>;
+                        ngpio = <32>;
+                        interrupts = <35>, <36>, <37>, <38>;
+                };
diff --git a/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt b/Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt
index 023c9526e5f8..023c9526e5f8 100644
--- a/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
+++ b/Documentation/devicetree/bindings/gpio/nvidia,tegra20-gpio.txt
diff --git a/Documentation/devicetree/bindings/i2c/cavium-i2c.txt b/Documentation/devicetree/bindings/i2c/cavium-i2c.txt
new file mode 100644
index 000000000000..dced82ebe31d
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/cavium-i2c.txt
@@ -0,0 +1,34 @@
+* Two Wire Serial Interface (TWSI) / I2C
+- compatible: "cavium,octeon-3860-twsi"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the TWSI/I2C bus controller register bank.
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.  I2C addresses have no size component.
+- interrupts: A single interrupt specifier.
+- clock-frequency: The I2C bus clock rate in Hz.
+Example:
+        twsi0: i2c@1180000001000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "cavium,octeon-3860-twsi";
+                reg = <0x11800 0x00001000 0x0 0x200>;
+                interrupts = <0 45>;
+                clock-frequency = <100000>;
+                rtc@68 {
+                        compatible = "dallas,ds1337";
+                        reg = <0x68>;
+                };
+                tmp@4c {
+                        compatible = "ti,tmp421";
+                        reg = <0x4c>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio_i2c.txt b/Documentation/devicetree/bindings/i2c/gpio-i2c.txt
index 4f8ec947c6bd..4f8ec947c6bd 100644
--- a/Documentation/devicetree/bindings/gpio/gpio_i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/gpio-i2c.txt
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mxs.txt b/Documentation/devicetree/bindings/i2c/i2c-mxs.txt
index 1bfc02de1b0c..30ac3a0557f7 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mxs.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mxs.txt
@@ -4,6 +4,8 @@ Required properties:
 - compatible: Should be "fsl,<chip>-i2c"
 - reg: Should contain registers location and length
 - interrupts: Should contain ERROR and DMA interrupts
+- clock-frequency: Desired I2C bus clock frequency in Hz.
+                   Only 100000Hz and 400000Hz modes are supported.
 Examples:
@@ -13,4 +15,5 @@ i2c0: i2c@80058000 {
        compatible = "fsl,imx28-i2c";
        reg = <0x80058000 2000>;
        interrupts = <111 68>;
+        clock-frequency = <100000>;
 };
diff --git a/Documentation/devicetree/bindings/i2c/i2c-ocores.txt b/Documentation/devicetree/bindings/i2c/i2c-ocores.txt
new file mode 100644
index 000000000000..c15781f4dc8c
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-ocores.txt
@@ -0,0 +1,33 @@
+Device tree configuration for i2c-ocores
+Required properties:
+- compatible      : "opencores,i2c-ocores"
+- reg             : bus address start and address range size of device
+- interrupts      : interrupt number
+- clock-frequency : frequency of bus clock in Hz
+- #address-cells  : should be <1>
+- #size-cells     : should be <0>
+Optional properties:
+- reg-shift       : device register offsets are shifted by this value
+- reg-io-width    : io register width in bytes (1, 2 or 4)
+- regstep         : deprecated, use reg-shift above
+Example:
+        i2c0: ocores@a0000000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "opencores,i2c-ocores";
+                reg = <0xa0000000 0x8>;
+                interrupts = <10>;
+                clock-frequency = <20000000>;
+                reg-shift = <0>;        /* 8 bit registers */
+                reg-io-width = <1>;     /* 8 bit read/write */
+                dummy@60 {
+                        compatible = "dummy";
+                        reg = <0x60>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt b/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt
index b891ee218354..0f7945019f6f 100644
--- a/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt
+++ b/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt
@@ -1,4 +1,4 @@
-* I2C
+* Marvell MMP I2C controller
 Required properties :
@@ -32,3 +32,20 @@ Examples:
                interrupts = <58>;
        };
+* Marvell MV64XXX I2C controller
+Required properties :
+ - reg             : Offset and length of the register set for the device
+ - compatible      : Should be "marvell,mv64xxx-i2c"
+ - interrupts      : The interrupt number
+ - clock-frequency : Desired I2C bus clock frequency in Hz.
+Examples:
+        i2c@11000 {
+                compatible = "marvell,mv64xxx-i2c";
+                reg = <0x11000 0x20>;
+                interrupts = <29>;
+                clock-frequency = <100000>;
+        };
diff --git a/Documentation/devicetree/bindings/input/lpc32xx-key.txt b/Documentation/devicetree/bindings/input/lpc32xx-key.txt
new file mode 100644
index 000000000000..31afd5014c48
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/lpc32xx-key.txt
@@ -0,0 +1,28 @@
+NXP LPC32xx Key Scan Interface
+Required Properties:
+- compatible: Should be "nxp,lpc3220-key"
+- reg: Physical base address of the controller and length of memory mapped
+  region.
+- interrupts: The interrupt number to the cpu.
+- keypad,num-rows: Number of rows and columns, e.g. 1: 1x1, 6: 6x6
+- keypad,num-columns: Must be equal to keypad,num-rows since LPC32xx only
+  supports square matrices
+- nxp,debounce-delay-ms: Debounce delay in ms
+- nxp,scan-delay-ms: Repeated scan period in ms
+- linux,keymap: the key-code to be reported when the key is pressed
+  and released, see also
+  Documentation/devicetree/bindings/input/matrix-keymap.txt
+Example:
+        key@40050000 {
+                compatible = "nxp,lpc3220-key";
+                reg = <0x40050000 0x1000>;
+                interrupts = <54 0>;
+                keypad,num-rows = <1>;
+                keypad,num-columns = <1>;
+                nxp,debounce-delay-ms = <3>;
+                nxp,scan-delay-ms = <34>;
+                linux,keymap = <0x00000002>;
+        };
diff --git a/Documentation/devicetree/bindings/input/tegra-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
index 72683be6de35..72683be6de35 100644
--- a/Documentation/devicetree/bindings/input/tegra-kbc.txt
+++ b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt
diff --git a/Documentation/devicetree/bindings/input/omap-keypad.txt b/Documentation/devicetree/bindings/input/omap-keypad.txt
new file mode 100644
index 000000000000..f2fa5e10493d
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/omap-keypad.txt
@@ -0,0 +1,31 @@
+* TI's Keypad Controller device tree bindings
+TI's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+Required SoC Specific Properties:
+- compatible: should be one of the following
+   - "ti,omap4-keypad": For controllers compatible with omap4 keypad
+      controller.
+Required Board Specific Properties, in addition to those specified by
+the shared matrix-keyboard bindings:
+- keypad,num-rows: Number of row lines connected to the keypad
+  controller.
+- keypad,num-columns: Number of column lines connected to the
+  keypad controller.
+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.
+Example:
+        keypad@4ae1c000{
+                compatible = "ti,omap4-keypad";
+                keypad,num-rows = <2>;
+                keypad,num-columns = <8>;
+                linux,keypad-no-autorepeat;
+        };
diff --git a/Documentation/devicetree/bindings/input/twl6040-vibra.txt b/Documentation/devicetree/bindings/input/twl6040-vibra.txt
deleted file mode 100644
index 5b1918b818fb..000000000000
--- a/Documentation/devicetree/bindings/input/twl6040-vibra.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Vibra driver for the twl6040 family
-The vibra driver is a child of the twl6040 MFD dirver.
-Documentation/devicetree/bindings/mfd/twl6040.txt
-Required properties:
- compatible : Must be "ti,twl6040-vibra";
- interrupts: 4, Vibra overcurrent interrupt
- vddvibl-supply: Regulator supplying the left vibra motor
- vddvibr-supply: Regulator supplying the right vibra motor
- vibldrv_res: Board specific left driver resistance
- vibrdrv_res: Board specific right driver resistance
- viblmotor_res: Board specific left motor resistance
- vibrmotor_res: Board specific right motor resistance
-Optional properties:
- vddvibl_uV: If the vddvibl default voltage need to be changed
- vddvibr_uV: If the vddvibr default voltage need to be changed
-Example:
-/*
- * 8-channel high quality low-power audio codec
- * http://www.ti.com/lit/ds/symlink/twl6040.pdf
- */
-twl6040: twl6040@4b {
-        ...
-        twl6040_vibra: twl6040@1 {
-                compatible = "ti,twl6040-vibra";
-                interrupts = <4>;
-                vddvibl-supply = <&vbat>;
-                vddvibr-supply = <&vbat>;
-                vibldrv_res = <8>;
-                vibrdrv_res = <3>;
-                viblmotor_res = <10>;
-                vibrmotor_res = <10>;
-        };
-};
diff --git a/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt b/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt
new file mode 100644
index 000000000000..89fb5434b730
--- /dev/null
+++ b/Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt
@@ -0,0 +1,21 @@
+NVIDIA Tegra 30 IOMMU H/W, SMMU (System Memory Management Unit)
+Required properties:
+- compatible : "nvidia,tegra30-smmu"
+- reg : Should contain 3 register banks(address and length) for each
+  of the SMMU register blocks.
+- interrupts : Should contain MC General interrupt.
+- nvidia,#asids : # of ASIDs
+- dma-window : IOVA start address and length.
+- nvidia,ahb : phandle to the ahb bus connected to SMMU.
+Example:
+        smmu {
+                compatible = "nvidia,tegra30-smmu";
+                reg = <0x7000f010 0x02c
+                       0x7000f1f0 0x010
+                       0x7000f228 0x05c>;
+                nvidia,#asids = <4>;            /* # of ASIDs */
+                dma-window = <0 0x40000000>;    /* IOVA start & length */
+                nvidia,ahb = <&ahb>;
+        };
diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt
new file mode 100644
index 000000000000..69e757a657a0
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/ab8500.txt
@@ -0,0 +1,123 @@
+* AB8500 Multi-Functional Device (MFD)
+Required parent device properties:
+- compatible             : contains "stericsson,ab8500";
+- interrupts             : contains the IRQ line for the AB8500
+- interrupt-controller   : describes the AB8500 as an Interrupt Controller (has its own domain)
+- #interrupt-cells       : should be 2, for 2-cell format
+                            - The first cell is the AB8500 local IRQ number
+                            - The second cell is used to specify optional parameters
+                              - bits[3:0] trigger type and level flags:
+                                  1 = low-to-high edge triggered
+                                  2 = high-to-low edge triggered
+                                  4 = active high level-sensitive
+                                  8 = active low level-sensitive
+Optional parent device properties:
+- reg                    : contains the PRCMU mailbox address for the AB8500 i2c port
+The AB8500 consists of a large and varied group of sub-devices:
+Device                     IRQ Names              Supply Names   Description
+------                     ---------              ------------   -----------
+ab8500-bm                :                      :              : Battery Manager
+ab8500-btemp             :                      :              : Battery Temperature
+ab8500-charger           :                      :              : Battery Charger
+ab8500-fg                :                      :              : Fuel Gauge
+ab8500-gpadc             : HW_CONV_END          : vddadc       : Analogue to Digital Converter
+                           SW_CONV_END          :              :
+ab8500-gpio              :                      :              : GPIO Controller
+ab8500-ponkey            : ONKEY_DBF            :              : Power-on Key
+                           ONKEY_DBR            :              :
+ab8500-pwm               :                      :              : Pulse Width Modulator
+ab8500-regulator         :                      :              : Regulators
+ab8500-rtc               : 60S                  :              : Real Time Clock
+                         : ALARM                :              :
+ab8500-sysctrl           :                      :              : System Control
+ab8500-usb               : ID_WAKEUP_R          : vddulpivio18 : Universal Serial Bus
+                         : ID_WAKEUP_F          : v-ape        :
+                         : VBUS_DET_F           : musb_1v8     :
+                         : VBUS_DET_R           :              :
+                         : USB_LINK_STATUS      :              :
+                         : USB_ADP_PROBE_PLUG   :              :
+                         : USB_ADP_PROBE_UNPLUG :              :
+Required child device properties:
+- compatible             : "stericsson,ab8500-[bm|btemp|charger|fg|gpadc|gpio|ponkey|
+                                               pwm|regulator|rtc|sysctrl|usb]";
+Optional child device properties:
+- interrupts             : contains the device IRQ(s) using the 2-cell format (see above)
+- interrupt-names        : contains names of IRQ resource in the order in which they were
+                           supplied in the interrupts property
+- <supply_name>-supply   : contains a phandle to the regulator supply node in Device Tree
+ab8500@5 {
+         compatible = "stericsson,ab8500";
+         reg = <5>; /* mailbox 5 is i2c */
+         interrupts = <0 40 0x4>;
+         interrupt-controller;
+         #interrupt-cells = <2>;
+         ab8500-rtc {
+                 compatible = "stericsson,ab8500-rtc";
+                 interrupts = <17 0x4
+                               18 0x4>;
+                 interrupt-names = "60S", "ALARM";
+         };
+        ab8500-gpadc {
+                compatible = "stericsson,ab8500-gpadc";
+                interrupts = <32 0x4
+                              39 0x4>;
+                interrupt-names = "HW_CONV_END", "SW_CONV_END";
+                vddadc-supply = <&ab8500_ldo_tvout_reg>;
+        };
+        ab8500-usb {
+                compatible = "stericsson,ab8500-usb";
+                interrupts = < 90 0x4
+                               96 0x4
+                               14 0x4
+                               15 0x4
+                               79 0x4
+                               74 0x4
+                               75 0x4>;
+                interrupt-names = "ID_WAKEUP_R",
+                                  "ID_WAKEUP_F",
+                                  "VBUS_DET_F",
+                                  "VBUS_DET_R",
+                                  "USB_LINK_STATUS",
+                                  "USB_ADP_PROBE_PLUG",
+                                  "USB_ADP_PROBE_UNPLUG";
+                vddulpivio18-supply = <&ab8500_ldo_initcore_reg>;
+                v-ape-supply = <&db8500_vape_reg>;
+                musb_1v8-supply = <&db8500_vsmps2_reg>;
+        };
+        ab8500-ponkey {
+                compatible = "stericsson,ab8500-ponkey";
+                interrupts = <6 0x4
+                              7 0x4>;
+                interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
+        };
+        ab8500-sysctrl {
+                compatible = "stericsson,ab8500-sysctrl";
+        };
+        ab8500-pwm {
+                compatible = "stericsson,ab8500-pwm";
+        };
+        ab8500-regulators {
+                compatible = "stericsson,ab8500-regulator";
+                ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
+                        /*
+                         * See: Documentation/devicetree/bindings/regulator/regulator.txt
+                         * for more information on regulators
+                         */
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/mfd/max77686.txt b/Documentation/devicetree/bindings/mfd/max77686.txt
new file mode 100644
index 000000000000..c6a3469d3436
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/max77686.txt
@@ -0,0 +1,59 @@
+Maxim MAX77686 multi-function device
+MAX77686 is a Mulitifunction device with PMIC, RTC and Charger on chip. It is
+interfaced to host controller using i2c interface. PMIC and Charger submodules
+are addressed using same i2c slave address whereas RTC submodule uses
+different i2c slave address,presently for which we are statically creating i2c
+client while probing.This document describes the binding for mfd device and
+PMIC submodule.
+Required properties:
+- compatible : Must be "maxim,max77686";
+- reg : Specifies the i2c slave address of PMIC block.
+- interrupts : This i2c device has an IRQ line connected to the main SoC.
+- interrupt-parent : The parent interrupt controller.
+Optional node:
+- voltage-regulators : The regulators of max77686 have to be instantiated
+  under subnode named "voltage-regulators" using the following format.
+        regulator_name {
+                regulator-compatible = LDOn/BUCKn
+                standard regulator constraints....
+        };
+        refer Documentation/devicetree/bindings/regulator/regulator.txt
+  The regulator-compatible property of regulator should initialized with string
+to get matched with their hardware counterparts as follow:
+        -LDOn   :       for LDOs, where n can lie in range 1 to 26.
+                        example: LDO1, LDO2, LDO26.
+        -BUCKn  :       for BUCKs, where n can lie in range 1 to 9.
+                        example: BUCK1, BUCK5, BUCK9.
+Example:
+        max77686@09 {
+                compatible = "maxim,max77686";
+                interrupt-parent = <&wakeup_eint>;
+                interrupts = <26 0>;
+                reg = <0x09>;
+                voltage-regulators {
+                        ldo11_reg {
+                                regulator-compatible = "LDO11";
+                                regulator-name = "vdd_ldo11";
+                                regulator-min-microvolt = <1900000>;
+                                regulator-max-microvolt = <1900000>;
+                                regulator-always-on;
+                        };
+                        buck1_reg {
+                                regulator-compatible = "BUCK1";
+                                regulator-name = "vdd_mif";
+                                regulator-min-microvolt = <950000>;
+                                regulator-max-microvolt = <1300000>;
+                                regulator-always-on;
+                                regulator-boot-on;
+                        };
+        }
diff --git a/Documentation/devicetree/bindings/mfd/tps65910.txt b/Documentation/devicetree/bindings/mfd/tps65910.txt
index 645f5eaadb3f..db03599ae4dc 100644
--- a/Documentation/devicetree/bindings/mfd/tps65910.txt
+++ b/Documentation/devicetree/bindings/mfd/tps65910.txt
@@ -17,18 +17,46 @@ Required properties:
  device need to be present. The definition for each of these nodes is defined
  using the standard binding for regulators found at
  Documentation/devicetree/bindings/regulator/regulator.txt.
+  The regulator is matched with the regulator-compatible.
-  The valid names for regulators are:
+  The valid regulator-compatible values are:
  tps65910: vrtc, vio, vdd1, vdd2, vdd3, vdig1, vdig2, vpll, vdac, vaux1,
            vaux2, vaux33, vmmc
  tps65911: vrtc, vio, vdd1, vdd3, vddctrl, ldo1, ldo2, ldo3, ldo4, ldo5,
            ldo6, ldo7, ldo8
+- xxx-supply: Input voltage supply regulator.
+  These entries are require if regulators are enabled for a device. Missing of these
+  properties can cause the regulator registration fails.
+  If some of input supply is powered through battery or always-on supply then
+  also it is require to have these parameters with proper node handle of always
+  on power supply.
+  tps65910:
+        vcc1-supply: VDD1 input.
+        vcc2-supply: VDD2 input.
+        vcc3-supply: VAUX33 and VMMC input.
+        vcc4-supply: VAUX1 and VAUX2 input.
+        vcc5-supply: VPLL and VDAC input.
+        vcc6-supply: VDIG1 and VDIG2 input.
+        vcc7-supply: VRTC input.
+        vccio-supply: VIO input.
+  tps65911:
+        vcc1-supply: VDD1 input.
+        vcc2-supply: VDD2 input.
+        vcc3-supply: LDO6, LDO7 and LDO8 input.
+        vcc4-supply: LDO5 input.
+        vcc5-supply: LDO3 and LDO4 input.
+        vcc6-supply: LDO1 and LDO2 input.
+        vcc7-supply: VRTC input.
+        vccio-supply: VIO input.
 Optional properties:
 - ti,vmbch-threshold: (tps65911) main battery charged threshold
  comparator. (see VMBCH_VSEL in TPS65910 datasheet)
 - ti,vmbch2-threshold: (tps65911) main battery discharged threshold
  comparator. (see VMBCH_VSEL in TPS65910 datasheet)
+- ti,en-ck32k-xtal: enable external 32-kHz crystal oscillator (see CK32K_CTRL
+  in TPS6591X datasheet)
 - ti,en-gpio-sleep: enable sleep control for gpios
  There should be 9 entries here, one for each gpio.
@@ -53,77 +81,113 @@ Example:
                ti,vmbch-threshold = 0;
                ti,vmbch2-threshold = 0;
+                ti,en-ck32k-xtal;
                ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>;
+                vcc1-supply = <&reg_parent>;
+                vcc2-supply = <&some_reg>;
+                vcc3-supply = <...>;
+                vcc4-supply = <...>;
+                vcc5-supply = <...>;
+                vcc6-supply = <...>;
+                vcc7-supply = <...>;
+                vccio-supply = <...>;
                regulators {
-                        vdd1_reg: vdd1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        vdd1_reg: regulator@0 {
+                                regulator-compatible = "vdd1";
+                                reg = <0>;
                                regulator-min-microvolt = < 600000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
                                regulator-boot-on;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        vdd2_reg: vdd2 {
+                        vdd2_reg: regulator@1 {
+                                regulator-compatible = "vdd2";
+                                reg = <1>;
                                regulator-min-microvolt = < 600000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
                                regulator-boot-on;
                                ti,regulator-ext-sleep-control = <4>;
                        };
-                        vddctrl_reg: vddctrl {
+                        vddctrl_reg: regulator@2 {
+                                regulator-compatible = "vddctrl";
+                                reg = <2>;
                                regulator-min-microvolt = < 600000>;
                                regulator-max-microvolt = <1400000>;
                                regulator-always-on;
                                regulator-boot-on;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        vio_reg: vio {
+                        vio_reg: regulator@3 {
+                                regulator-compatible = "vio";
+                                reg = <3>;
                                regulator-min-microvolt = <1500000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-always-on;
                                regulator-boot-on;
                                ti,regulator-ext-sleep-control = <1>;
                        };
-                        ldo1_reg: ldo1 {
+                        ldo1_reg: regulator@4 {
+                                regulator-compatible = "ldo1";
+                                reg = <4>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo2_reg: ldo2 {
+                        ldo2_reg: regulator@5 {
+                                regulator-compatible = "ldo2";
+                                reg = <5>;
                                regulator-min-microvolt = <1050000>;
                                regulator-max-microvolt = <1050000>;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo3_reg: ldo3 {
+                        ldo3_reg: regulator@6 {
+                                regulator-compatible = "ldo3";
+                                reg = <6>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo4_reg: ldo4 {
+                        ldo4_reg: regulator@7 {
+                                regulator-compatible = "ldo4";
+                                reg = <7>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-always-on;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo5_reg: ldo5 {
+                        ldo5_reg: regulator@8 {
+                                regulator-compatible = "ldo5";
+                                reg = <8>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo6_reg: ldo6 {
+                        ldo6_reg: regulator@9 {
+                                regulator-compatible = "ldo6";
+                                reg = <9>;
                                regulator-min-microvolt = <1200000>;
                                regulator-max-microvolt = <1200000>;
                                ti,regulator-ext-sleep-control = <0>;
                        };
-                        ldo7_reg: ldo7 {
+                        ldo7_reg: regulator@10 {
+                                regulator-compatible = "ldo7";
+                                reg = <10>;
                                regulator-min-microvolt = <1200000>;
                                regulator-max-microvolt = <1200000>;
                                regulator-always-on;
                                regulator-boot-on;
                                ti,regulator-ext-sleep-control = <1>;
                        };
-                        ldo8_reg: ldo8 {
+                        ldo8_reg: regulator@11 {
+                                regulator-compatible = "ldo8";
+                                reg = <11>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-always-on;
diff --git a/Documentation/devicetree/bindings/mfd/twl6040.txt b/Documentation/devicetree/bindings/mfd/twl6040.txt
index bc67c6f424aa..c855240f3a0e 100644
--- a/Documentation/devicetree/bindings/mfd/twl6040.txt
+++ b/Documentation/devicetree/bindings/mfd/twl6040.txt
@@ -6,7 +6,7 @@ They are connected ot the host processor via i2c for commands, McPDM for audio
 data and commands.
 Required properties:
- compatible : Must be "ti,twl6040";
+- compatible : "ti,twl6040" for twl6040, "ti,twl6041" for twl6041
 - reg: must be 0x4b for i2c address
 - interrupts: twl6040 has one interrupt line connecteded to the main SoC
 - interrupt-parent: The parent interrupt controller
diff --git a/Documentation/devicetree/bindings/mips/cavium/bootbus.txt b/Documentation/devicetree/bindings/mips/cavium/bootbus.txt
new file mode 100644
index 000000000000..6581478225a2
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cavium/bootbus.txt
@@ -0,0 +1,126 @@
+* Boot Bus
+The Octeon Boot Bus is a configurable parallel bus with 8 chip
+selects.  Each chip select is independently configurable.
+Properties:
+- compatible: "cavium,octeon-3860-bootbus"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the Boot Bus' register bank.
+- #address-cells: Must be <2>.  The first cell is the chip select
+   within the bootbus.  The second cell is the offset from the chip select.
+- #size-cells: Must be <1>.
+- ranges: There must be one one triplet of (child-bus-address,
+  parent-bus-address, length) for each active chip select.  If the
+  length element for any triplet is zero, the chip select is disabled,
+  making it inactive.
+The configuration parameters for each chip select are stored in child
+nodes.
+Configuration Properties:
+- compatible:  "cavium,octeon-3860-bootbus-config"
+- cavium,cs-index: A single cell indicating the chip select that
+  corresponds to this configuration.
+- cavium,t-adr: A cell specifying the ADR timing (in nS).
+- cavium,t-ce: A cell specifying the CE timing (in nS).
+- cavium,t-oe: A cell specifying the OE timing (in nS).
+- cavium,t-we: A cell specifying the WE timing (in nS).
+- cavium,t-rd-hld: A cell specifying the RD_HLD timing (in nS).
+- cavium,t-wr-hld: A cell specifying the WR_HLD timing (in nS).
+- cavium,t-pause: A cell specifying the PAUSE timing (in nS).
+- cavium,t-wait: A cell specifying the WAIT timing (in nS).
+- cavium,t-page: A cell specifying the PAGE timing (in nS).
+- cavium,t-rd-dly: A cell specifying the RD_DLY timing (in nS).
+- cavium,pages: A cell specifying the PAGES parameter (0 = 8 bytes, 1
+  = 2 bytes, 2 = 4 bytes, 3 = 8 bytes).
+- cavium,wait-mode: Optional.  If present, wait mode (WAITM) is selected.
+- cavium,page-mode: Optional.  If present, page mode (PAGEM) is selected.
+- cavium,bus-width: A cell specifying the WIDTH parameter (in bits) of
+  the bus for this chip select.
+- cavium,ale-mode: Optional.  If present, ALE mode is selected.
+- cavium,sam-mode: Optional.  If present, SAM mode is selected.
+- cavium,or-mode: Optional.  If present, OR mode is selected.
+Example:
+        bootbus: bootbus@1180000000000 {
+                compatible = "cavium,octeon-3860-bootbus";
+                reg = <0x11800 0x00000000 0x0 0x200>;
+                /* The chip select number and offset */
+                #address-cells = <2>;
+                /* The size of the chip select region */
+                #size-cells = <1>;
+                ranges = <0 0  0x0 0x1f400000  0xc00000>,
+                         <1 0  0x10000 0x30000000  0>,
+                         <2 0  0x10000 0x40000000  0>,
+                         <3 0  0x10000 0x50000000  0>,
+                         <4 0  0x0 0x1d020000  0x10000>,
+                         <5 0  0x0 0x1d040000  0x10000>,
+                         <6 0  0x0 0x1d050000  0x10000>,
+                         <7 0  0x10000 0x90000000  0>;
+                        cavium,cs-config@0 {
+                        compatible = "cavium,octeon-3860-bootbus-config";
+                        cavium,cs-index = <0>;
+                        cavium,t-adr  = <20>;
+                        cavium,t-ce   = <60>;
+                        cavium,t-oe   = <60>;
+                        cavium,t-we   = <45>;
+                        cavium,t-rd-hld = <35>;
+                        cavium,t-wr-hld = <45>;
+                        cavium,t-pause  = <0>;
+                        cavium,t-wait   = <0>;
+                        cavium,t-page   = <35>;
+                        cavium,t-rd-dly = <0>;
+                        cavium,pages     = <0>;
+                        cavium,bus-width = <8>;
+                };
+                .
+                .
+                .
+                cavium,cs-config@6 {
+                        compatible = "cavium,octeon-3860-bootbus-config";
+                        cavium,cs-index = <6>;
+                        cavium,t-adr  = <5>;
+                        cavium,t-ce   = <300>;
+                        cavium,t-oe   = <270>;
+                        cavium,t-we   = <150>;
+                        cavium,t-rd-hld = <100>;
+                        cavium,t-wr-hld = <70>;
+                        cavium,t-pause  = <0>;
+                        cavium,t-wait   = <0>;
+                        cavium,t-page   = <320>;
+                        cavium,t-rd-dly = <0>;
+                        cavium,pages     = <0>;
+                        cavium,wait-mode;
+                        cavium,bus-width = <16>;
+                };
+                .
+                .
+                .
+        };
diff --git a/Documentation/devicetree/bindings/mips/cavium/ciu.txt b/Documentation/devicetree/bindings/mips/cavium/ciu.txt
new file mode 100644
index 000000000000..2c2d0746b43d
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cavium/ciu.txt
@@ -0,0 +1,26 @@
+* Central Interrupt Unit
+Properties:
+- compatible: "cavium,octeon-3860-ciu"
+  Compatibility with all cn3XXX, cn5XXX and cn63XX SOCs.
+- interrupt-controller:  This is an interrupt controller.
+- reg: The base address of the CIU's register bank.
+- #interrupt-cells: Must be <2>.  The first cell is the bank within
+   the CIU and may have a value of 0 or 1.  The second cell is the bit
+   within the bank and may have a value between 0 and 63.
+Example:
+        interrupt-controller@1070000000000 {
+                compatible = "cavium,octeon-3860-ciu";
+                interrupt-controller;
+                /* Interrupts are specified by two parts:
+                 * 1) Controller register (0 or 1)
+                 * 2) Bit within the register (0..63)
+                 */
+                #interrupt-cells = <2>;
+                reg = <0x10700 0x00000000 0x0 0x7000>;
+        };
diff --git a/Documentation/devicetree/bindings/mips/cavium/ciu2.txt b/Documentation/devicetree/bindings/mips/cavium/ciu2.txt
new file mode 100644
index 000000000000..0ec7ba8bbbcb
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cavium/ciu2.txt
@@ -0,0 +1,27 @@
+* Central Interrupt Unit
+Properties:
+- compatible: "cavium,octeon-6880-ciu2"
+  Compatibility with 68XX SOCs.
+- interrupt-controller:  This is an interrupt controller.
+- reg: The base address of the CIU's register bank.
+- #interrupt-cells: Must be <2>.  The first cell is the bank within
+  the CIU and may have a value between 0 and 63.  The second cell is
+  the bit within the bank and may also have a value between 0 and 63.
+Example:
+        interrupt-controller@1070100000000 {
+                compatible = "cavium,octeon-6880-ciu2";
+                interrupt-controller;
+                /* Interrupts are specified by two parts:
+                 * 1) Controller register (0..63)
+                 * 2) Bit within the register (0..63)
+                 */
+                #address-cells = <0>;
+                #interrupt-cells = <2>;
+                reg = <0x10701 0x00000000 0x0 0x4000000>;
+        };
diff --git a/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt b/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt
new file mode 100644
index 000000000000..cb4291e3b1d1
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cavium/dma-engine.txt
@@ -0,0 +1,21 @@
+* DMA Engine.
+The Octeon DMA Engine transfers between the Boot Bus and main memory.
+The DMA Engine will be refered to by phandle by any device that is
+connected to it.
+Properties:
+- compatible: "cavium,octeon-5750-bootbus-dma"
+  Compatibility with all cn52XX, cn56XX and cn6XXX SOCs.
+- reg: The base address of the DMA Engine's register bank.
+- interrupts: A single interrupt specifier.
+Example:
+        dma0: dma-engine@1180000000100 {
+                compatible = "cavium,octeon-5750-bootbus-dma";
+                reg = <0x11800 0x00000100 0x0 0x8>;
+                interrupts = <0 63>;
+        };
diff --git a/Documentation/devicetree/bindings/mips/cavium/uctl.txt b/Documentation/devicetree/bindings/mips/cavium/uctl.txt
new file mode 100644
index 000000000000..aa66b9b8d801
--- /dev/null
+++ b/Documentation/devicetree/bindings/mips/cavium/uctl.txt
@@ -0,0 +1,46 @@
+* UCTL USB controller glue
+Properties:
+- compatible: "cavium,octeon-6335-uctl"
+  Compatibility with all cn6XXX SOCs.
+- reg: The base address of the UCTL register bank.
+- #address-cells: Must be <2>.
+- #size-cells: Must be <2>.
+- ranges: Empty to signify direct mapping of the children.
+- refclk-frequency: A single cell containing the reference clock
+  frequency in Hz.
+- refclk-type: A string describing the reference clock connection
+  either "crystal" or "external".
+Example:
+        uctl@118006f000000 {
+                compatible = "cavium,octeon-6335-uctl";
+                reg = <0x11800 0x6f000000 0x0 0x100>;
+                ranges; /* Direct mapping */
+                #address-cells = <2>;
+                #size-cells = <2>;
+                /* 12MHz, 24MHz and 48MHz allowed */
+                refclk-frequency = <24000000>;
+                /* Either "crystal" or "external" */
+                refclk-type = "crystal";
+                ehci@16f0000000000 {
+                        compatible = "cavium,octeon-6335-ehci","usb-ehci";
+                        reg = <0x16f00 0x00000000 0x0 0x100>;
+                        interrupts = <0 56>;
+                        big-endian-regs;
+                };
+                ohci@16f0000000400 {
+                        compatible = "cavium,octeon-6335-ohci","usb-ohci";
+                        reg = <0x16f00 0x00000400 0x0 0x100>;
+                        interrupts = <0 56>;
+                        big-endian-regs;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/misc/at25.txt b/Documentation/devicetree/bindings/misc/at25.txt
new file mode 100644
index 000000000000..ab3c327929dd
--- /dev/null
+++ b/Documentation/devicetree/bindings/misc/at25.txt
@@ -0,0 +1,21 @@
+Atmel AT25 eeprom
+Required properties:
+- compatible : "atmel,at25".
+- reg : chip select number
+- spi-max-frequency : max spi frequency to use
+- at25,byte-len : total eeprom size in bytes
+- at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h
+- at25,page-size : size of the eeprom page
+Examples:
+at25@0 {
+        compatible = "atmel,at25";
+        reg = <0>
+        spi-max-frequency = <5000000>;
+        at25,byte-len = <0x8000>;
+        at25,addr-mode = <2>;
+        at25,page-size = <64>;
+};
diff --git a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
index 0d93b4b0e0e3..bd9be0b5bc20 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
+++ b/Documentation/devicetree/bindings/mmc/fsl-esdhc.txt
@@ -3,21 +3,22 @@
 The Enhanced Secure Digital Host Controller provides an interface
 for MMC, SD, and SDIO types of memory cards.
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the sdhci-esdhc driver.
 Required properties:
-  - compatible : should be
-    "fsl,<chip>-esdhc", "fsl,esdhc"
-  - reg : should contain eSDHC registers location and length.
-  - interrupts : should contain eSDHC interrupt.
  - interrupt-parent : interrupt source phandle.
  - clock-frequency : specifies eSDHC base clock frequency.
-  - sdhci,wp-inverted : (optional) specifies that eSDHC controller
-    reports inverted write-protect state; New devices should use
+Optional properties:
-    the generic "wp-inverted" property.
+  - sdhci,wp-inverted : specifies that eSDHC controller reports
-  - sdhci,1-bit-only : (optional) specifies that a controller can
+    inverted write-protect state; New devices should use the generic
-    only handle 1-bit data transfers. New devices should use the
+    "wp-inverted" property.
-    generic "bus-width = <1>" property.
+  - sdhci,1-bit-only : specifies that a controller can only handle
-  - sdhci,auto-cmd12: (optional) specifies that a controller can
+    1-bit data transfers. New devices should use the generic
-    only handle auto CMD12.
+    "bus-width = <1>" property.
+  - sdhci,auto-cmd12: specifies that a controller can only handle auto
+    CMD12.
 Example:
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
index fea541ee8b34..70cd49b1caa8 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
@@ -3,17 +3,15 @@
 The Enhanced Secure Digital Host Controller on Freescale i.MX family
 provides an interface for MMC, SD, and SDIO types of memory cards.
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the sdhci-esdhc-imx driver.
 Required properties:
 - compatible : Should be "fsl,<chip>-esdhc"
- reg : Should contain eSDHC registers location and length
- interrupts : Should contain eSDHC interrupt
 Optional properties:
- non-removable : Indicate the card is wired to host permanently
 - fsl,cd-internal : Indicate to use controller internal card detection
 - fsl,wp-internal : Indicate to use controller internal write protection
- cd-gpios : Specify GPIOs for card detection
- wp-gpios : Specify GPIOs for write protection
 Examples:
diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
index d64aea5a4203..0e5e2ec4001d 100644
--- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt
@@ -1,8 +1,9 @@
 MMC/SD/SDIO slot directly connected to a SPI bus
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the mmc_spi driver.
 Required properties:
- compatible : should be "mmc-spi-slot".
- reg : should specify SPI address (chip-select number).
 - spi-max-frequency : maximum frequency for this device (Hz).
 - voltage-ranges : two cells are required, first cell specifies minimum
  slot voltage (mV), second cell specifies maximum slot voltage (mV).
@@ -11,8 +12,7 @@ Required properties:
 Optional properties:
 - gpios : may specify GPIOs in this order: Card-Detect GPIO,
  Write-Protect GPIO. Note that this does not follow the
-  binding from mmc.txt, for historic reasons.
+  binding from mmc.txt, for historical reasons.
- interrupts : the interrupt of a card detect interrupt.
 - interrupt-parent : the phandle for the interrupt controller that
  services interrupts for this device.
diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 6e70dcde0a71..8a6811f4a02f 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mmc.txt
@@ -2,13 +2,17 @@ These properties are common to multiple MMC host controllers. Any host
 that requires the respective functionality should implement them using
 these definitions.
+Interpreted by the OF core:
+- reg: Registers location and length.
+- interrupts: Interrupts used by the MMC controller.
 Required properties:
 - bus-width: Number of data lines, can be <1>, <4>, or <8>
 Optional properties:
- cd-gpios : Specify GPIOs for card detection, see gpio binding
+- cd-gpios: Specify GPIOs for card detection, see gpio binding
- wp-gpios : Specify GPIOs for write protection, see gpio binding
+- wp-gpios: Specify GPIOs for write protection, see gpio binding
- cd-inverted: when present, polarity on the wp gpio line is inverted
+- cd-inverted: when present, polarity on the cd gpio line is inverted
 - wp-inverted: when present, polarity on the wp gpio line is inverted
 - non-removable: non-removable slot (like eMMC)
 - max-frequency: maximum operating clock frequency
diff --git a/Documentation/devicetree/bindings/mmc/mmci.txt b/Documentation/devicetree/bindings/mmc/mmci.txt
index 14a81d526118..2b584cae352a 100644
--- a/Documentation/devicetree/bindings/mmc/mmci.txt
+++ b/Documentation/devicetree/bindings/mmc/mmci.txt
@@ -1,19 +1,15 @@
 * ARM PrimeCell MultiMedia Card Interface (MMCI) PL180/1
-The ARM PrimeCell MMCI PL180 and PL181 provides and interface for
+The ARM PrimeCell MMCI PL180 and PL181 provides an interface for
 reading and writing to MultiMedia and SD cards alike.
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the mmci driver.
 Required properties:
 - compatible             : contains "arm,pl18x", "arm,primecell".
- reg                    : contains pl18x registers and length.
- interrupts             : contains the device IRQ(s).
 - arm,primecell-periphid : contains the PrimeCell Peripheral ID.
 Optional properties:
- wp-gpios               : contains any write protect (ro) gpios
- cd-gpios               : contains any card detection gpios
- cd-inverted            : indicates whether the cd gpio is inverted
- max-frequency          : contains the maximum operating frequency
- bus-width              : number of data lines, can be <1>, <4>, or <8>
 - mmc-cap-mmc-highspeed  : indicates whether MMC is high speed capable
 - mmc-cap-sd-highspeed   : indicates whether SD is high speed capable
diff --git a/Documentation/devicetree/bindings/mmc/mxs-mmc.txt b/Documentation/devicetree/bindings/mmc/mxs-mmc.txt
index 14d870a9e3db..54949f6faede 100644
--- a/Documentation/devicetree/bindings/mmc/mxs-mmc.txt
+++ b/Documentation/devicetree/bindings/mmc/mxs-mmc.txt
@@ -3,16 +3,14 @@
 The Freescale MXS Synchronous Serial Ports (SSP) can act as a MMC controller
 to support MMC, SD, and SDIO types of memory cards.
+This file documents differences between the core properties in mmc.txt
+and the properties used by the mxsmmc driver.
 Required properties:
 - compatible: Should be "fsl,<chip>-mmc".  The supported chips include
  imx23 and imx28.
- reg: Should contain registers location and length
 - interrupts: Should contain ERROR and DMA interrupts
 - fsl,ssp-dma-channel: APBH DMA channel for the SSP
- bus-width: Number of data lines, can be <1>, <4>, or <8>
-Optional properties:
- wp-gpios: Specify GPIOs for write protection
 Examples:
diff --git a/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
index f77c3031607f..c6d7b11db9eb 100644
--- a/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
@@ -3,15 +3,13 @@
 This controller on Tegra family SoCs provides an interface for MMC, SD,
 and SDIO types of memory cards.
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the sdhci-tegra driver.
 Required properties:
 - compatible : Should be "nvidia,<chip>-sdhci"
- reg : Should contain SD/MMC registers location and length
- interrupts : Should contain SD/MMC interrupt
- bus-width : Number of data lines, can be <1>, <4>, or <8>
 Optional properties:
- cd-gpios : Specify GPIOs for card detection
- wp-gpios : Specify GPIOs for write protection
 - power-gpios : Specify GPIOs for power control
 Example:
diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
new file mode 100644
index 000000000000..dbe98a3c183a
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt
@@ -0,0 +1,21 @@
+* Marvell sdhci-pxa v2/v3 controller
+This file documents differences between the core properties in mmc.txt
+and the properties used by the sdhci-pxav2 and sdhci-pxav3 drivers.
+Required properties:
+- compatible: Should be "mrvl,pxav2-mmc" or "mrvl,pxav3-mmc".
+Optional properties:
+- mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning.
+Example:
+sdhci@d4280800 {
+        compatible = "mrvl,pxav3-mmc";
+        reg = <0xd4280800 0x800>;
+        bus-width = <8>;
+        interrupts = <27>;
+        non-removable;
+        mrvl,clk-delay-cycles = <31>;
+};
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
index 8a53958c9a9f..be76a23b34c4 100644
--- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -3,21 +3,20 @@
 The Highspeed MMC Host Controller on TI OMAP family
 provides an interface for MMC, SD, and SDIO types of memory cards.
+This file documents differences between the core properties described
+by mmc.txt and the properties used by the omap_hsmmc driver.
 Required properties:
 - compatible:
 Should be "ti,omap2-hsmmc", for OMAP2 controllers
 Should be "ti,omap3-hsmmc", for OMAP3 controllers
 Should be "ti,omap4-hsmmc", for OMAP4 controllers
 - ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
- reg : should contain hsmmc registers location and length
 Optional properties:
 ti,dual-volt: boolean, supports dual voltage cards
 <supply-name>-supply: phandle to the regulator device tree node
 "supply-name" examples are "vmmc", "vmmc_aux" etc
-bus-width: Number of data lines, default assumed is 1 if the property is missing.
-cd-gpios: GPIOs for card detection
-wp-gpios: GPIOs for write protection
 ti,non-removable: non-removable slot (like eMMC)
 ti,needs-special-reset: Requires a special softreset sequence
diff --git a/Documentation/devicetree/bindings/mtd/orion-nand.txt b/Documentation/devicetree/bindings/mtd/orion-nand.txt
index b2356b7d2fa4..2d6ab660e603 100644
--- a/Documentation/devicetree/bindings/mtd/orion-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/orion-nand.txt
@@ -1,7 +1,7 @@
 NAND support for Marvell Orion SoC platforms
 Required properties:
- compatible : "mrvl,orion-nand".
+- compatible : "marvell,orion-nand".
 - reg : Base physical address of the NAND and length of memory mapped
        region
@@ -24,7 +24,7 @@ nand@f4000000 {
        ale = <1>;
        bank-width = <1>;
        chip-delay = <25>;
-        compatible = "mrvl,orion-nand";
+        compatible = "marvell,orion-nand";
        reg = <0xf4000000 0x400>;
        partition@0 {
diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Documentation/devicetree/bindings/mtd/partition.txt
index f114ce1657c2..6e1f61f1e789 100644
--- a/Documentation/devicetree/bindings/mtd/partition.txt
+++ b/Documentation/devicetree/bindings/mtd/partition.txt
@@ -35,4 +35,4 @@ flash@0 {
        uimage@100000 {
                reg = <0x0100000 0x200000>;
        };
-];
+};
diff --git a/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt b/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
new file mode 100644
index 000000000000..7c86d5e28a0e
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt
@@ -0,0 +1,29 @@
+The Broadcom BCM87XX devices are a family of 10G Ethernet PHYs.  They
+have these bindings in addition to the standard PHY bindings.
+Compatible: Should contain "broadcom,bcm8706" or "broadcom,bcm8727" and
+            "ethernet-phy-ieee802.3-c45"
+Optional Properties:
+- broadcom,c45-reg-init : one of more sets of 4 cells.  The first cell
+  is the MDIO Manageable Device (MMD) address, the second a register
+  address within the MMD, the third cell contains a mask to be ANDed
+  with the existing register value, and the fourth cell is ORed with
+  he result to yield the new register value.  If the third cell has a
+  value of zero, no read of the existing value is performed.
+Example:
+        ethernet-phy@5 {
+                reg = <5>;
+                compatible = "broadcom,bcm8706", "ethernet-phy-ieee802.3-c45";
+                interrupt-parent = <&gpio>;
+                interrupts = <12 8>; /* Pin 12, active low */
+                /*
+                 * Set PMD Digital Control Register for
+                 * GPIO[1] Tx/Rx
+                 * GPIO[0] R64 Sync Acquired
+                 */
+                broadcom,c45-reg-init = <1 0xc808 0xff8f 0x70>;
+        };
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
index f31b686d4556..8ff324eaa889 100644
--- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
+++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt
@@ -11,6 +11,9 @@ Required properties:
 - reg : Offset and length of the register set for this device
 - interrupts : Interrupt tuple for this device
+Optional properties:
 - clock-frequency : The oscillator frequency driving the flexcan device
 Example:
diff --git a/Documentation/devicetree/bindings/net/cavium-mdio.txt b/Documentation/devicetree/bindings/net/cavium-mdio.txt
new file mode 100644
index 000000000000..04cb7491d232
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/cavium-mdio.txt
@@ -0,0 +1,27 @@
+* System Management Interface (SMI) / MDIO
+Properties:
+- compatible: "cavium,octeon-3860-mdio"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the MDIO bus controller register bank.
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.  MDIO addresses have no size component.
+Typically an MDIO bus might have several children.
+Example:
+        mdio@1180000001800 {
+                compatible = "cavium,octeon-3860-mdio";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x11800 0x00001800 0x0 0x40>;
+                ethernet-phy@0 {
+                        ...
+                        reg = <0>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/cavium-mix.txt b/Documentation/devicetree/bindings/net/cavium-mix.txt
new file mode 100644
index 000000000000..5da628db68bf
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/cavium-mix.txt
@@ -0,0 +1,39 @@
+* MIX Ethernet controller.
+Properties:
+- compatible: "cavium,octeon-5750-mix"
+  Compatibility with all cn5XXX and cn6XXX SOCs populated with MIX
+  devices.
+- reg: The base addresses of four separate register banks.  The first
+  bank contains the MIX registers.  The second bank the corresponding
+  AGL registers.  The third bank are the AGL registers shared by all
+  MIX devices present.  The fourth bank is the AGL_PRT_CTL shared by
+  all MIX devices present.
+- cell-index: A single cell specifying which portion of the shared
+  register banks corresponds to this MIX device.
+- interrupts: Two interrupt specifiers.  The first is the MIX
+  interrupt routing and the second the routing for the AGL interrupts.
+- mac-address: Optional, the MAC address to assign to the device.
+- local-mac-address: Optional, the MAC address to assign to the device
+  if mac-address is not specified.
+- phy-handle: Optional, a phandle for the PHY device connected to this device.
+Example:
+        ethernet@1070000100800 {
+                compatible = "cavium,octeon-5750-mix";
+                reg = <0x10700 0x00100800 0x0 0x100>, /* MIX */
+                      <0x11800 0xE0000800 0x0 0x300>, /* AGL */
+                      <0x11800 0xE0000400 0x0 0x400>, /* AGL_SHARED  */
+                      <0x11800 0xE0002008 0x0 0x8>;   /* AGL_PRT_CTL */
+                cell-index = <1>;
+                interrupts = <1 18>, < 1 46>;
+                local-mac-address = [ 00 0f b7 10 63 54 ];
+                phy-handle = <&phy1>;
+        };
diff --git a/Documentation/devicetree/bindings/net/cavium-pip.txt b/Documentation/devicetree/bindings/net/cavium-pip.txt
new file mode 100644
index 000000000000..d4c53ba04b3b
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/cavium-pip.txt
@@ -0,0 +1,98 @@
+* PIP Ethernet nexus.
+The PIP Ethernet nexus can control several data packet input/output
+devices.  The devices have a two level grouping scheme.  There may be
+several interfaces, and each interface may have several ports.  These
+ports might be an individual Ethernet PHY.
+Properties for the PIP nexus:
+- compatible: "cavium,octeon-3860-pip"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the PIP's register bank.
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.
+Properties for PIP interfaces which is a child the PIP nexus:
+- compatible: "cavium,octeon-3860-pip-interface"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The interface number.
+- #address-cells: Must be <1>.
+- #size-cells: Must be <0>.
+Properties for PIP port which is a child the PIP interface:
+- compatible: "cavium,octeon-3860-pip-port"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The port number within the interface group.
+- mac-address: Optional, the MAC address to assign to the device.
+- local-mac-address: Optional, the MAC address to assign to the device
+  if mac-address is not specified.
+- phy-handle: Optional, a phandle for the PHY device connected to this device.
+Example:
+        pip@11800a0000000 {
+                compatible = "cavium,octeon-3860-pip";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                reg = <0x11800 0xa0000000 0x0 0x2000>;
+                interface@0 {
+                        compatible = "cavium,octeon-3860-pip-interface";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0>; /* interface */
+                        ethernet@0 {
+                                compatible = "cavium,octeon-3860-pip-port";
+                                reg = <0x0>; /* Port */
+                                local-mac-address = [ 00 0f b7 10 63 60 ];
+                                phy-handle = <&phy2>;
+                        };
+                        ethernet@1 {
+                                compatible = "cavium,octeon-3860-pip-port";
+                                reg = <0x1>; /* Port */
+                                local-mac-address = [ 00 0f b7 10 63 61 ];
+                                phy-handle = <&phy3>;
+                        };
+                        ethernet@2 {
+                                compatible = "cavium,octeon-3860-pip-port";
+                                reg = <0x2>; /* Port */
+                                local-mac-address = [ 00 0f b7 10 63 62 ];
+                                phy-handle = <&phy4>;
+                        };
+                        ethernet@3 {
+                                compatible = "cavium,octeon-3860-pip-port";
+                                reg = <0x3>; /* Port */
+                                local-mac-address = [ 00 0f b7 10 63 63 ];
+                                phy-handle = <&phy5>;
+                        };
+                };
+                interface@1 {
+                        compatible = "cavium,octeon-3860-pip-interface";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <1>; /* interface */
+                        ethernet@0 {
+                                compatible = "cavium,octeon-3860-pip-port";
+                                reg = <0x0>; /* Port */
+                                local-mac-address = [ 00 0f b7 10 63 64 ];
+                                phy-handle = <&phy6>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/davinci_emac.txt b/Documentation/devicetree/bindings/net/davinci_emac.txt
new file mode 100644
index 000000000000..48b259e29e87
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/davinci_emac.txt
@@ -0,0 +1,41 @@
+* Texas Instruments Davinci EMAC
+This file provides information, what the device node
+for the davinci_emac interface contains.
+Required properties:
+- compatible: "ti,davinci-dm6467-emac";
+- reg: Offset and length of the register set for the device
+- ti,davinci-ctrl-reg-offset: offset to control register
+- ti,davinci-ctrl-mod-reg-offset: offset to control module register
+- ti,davinci-ctrl-ram-offset: offset to control module ram
+- ti,davinci-ctrl-ram-size: size of control module ram
+- ti,davinci-rmii-en: use RMII
+- ti,davinci-no-bd-ram: has the emac controller BD RAM
+- phy-handle: Contains a phandle to an Ethernet PHY.
+              if not, davinci_emac driver defaults to 100/FULL
+- interrupts: interrupt mapping for the davinci emac interrupts sources:
+              4 sources: <Receive Threshold Interrupt
+                          Receive Interrupt
+                          Transmit Interrupt
+                          Miscellaneous Interrupt>
+Optional properties:
+- local-mac-address : 6 bytes, mac address
+Example (enbw_cmc board):
+        eth0: emac@1e20000 {
+                compatible = "ti,davinci-dm6467-emac";
+                reg = <0x220000 0x4000>;
+                ti,davinci-ctrl-reg-offset = <0x3000>;
+                ti,davinci-ctrl-mod-reg-offset = <0x2000>;
+                ti,davinci-ctrl-ram-offset = <0>;
+                ti,davinci-ctrl-ram-size = <0x2000>;
+                local-mac-address = [ 00 00 00 00 00 00 ];
+                interrupts = <33
+                                34
+                                35
+                                36
+                                >;
+                interrupt-parent = <&intc>;
+        };
diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
index 4616fc28ee86..d53639221403 100644
--- a/Documentation/devicetree/bindings/net/fsl-fec.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -7,10 +7,14 @@ Required properties:
 - phy-mode : String, operation mode of the PHY interface.
  Supported values are: "mii", "gmii", "sgmii", "tbi", "rmii",
  "rgmii", "rgmii-id", "rgmii-rxid", "rgmii-txid", "rtbi", "smii".
- phy-reset-gpios : Should specify the gpio for phy reset
 Optional properties:
 - local-mac-address : 6 bytes, mac address
+- phy-reset-gpios : Should specify the gpio for phy reset
+- phy-reset-duration : Reset duration in milliseconds.  Should present
+  only if property "phy-reset-gpios" is available.  Missing the property
+  will have the duration be 1 millisecond.  Numbers greater than 1000 are
+  invalid and 1 millisecond will be used instead.
 Example:
diff --git a/Documentation/devicetree/bindings/net/phy.txt b/Documentation/devicetree/bindings/net/phy.txt
index bb8c742eb8c5..7cd18fbfcf71 100644
--- a/Documentation/devicetree/bindings/net/phy.txt
+++ b/Documentation/devicetree/bindings/net/phy.txt
@@ -14,10 +14,20 @@ Required properties:
 - linux,phandle :  phandle for this node; likely referenced by an
   ethernet controller node.
+Optional Properties:
+- compatible: Compatible list, may contain
+  "ethernet-phy-ieee802.3-c22" or "ethernet-phy-ieee802.3-c45" for
+  PHYs that implement IEEE802.3 clause 22 or IEEE802.3 clause 45
+  specifications. If neither of these are specified, the default is to
+  assume clause 22. The compatible list may also contain other
+  elements.
 Example:
 ethernet-phy@0 {
-        linux,phandle = <2452000>
+        compatible = "ethernet-phy-ieee802.3-c22";
+        linux,phandle = <2452000>;
        interrupt-parent = <40000>;
        interrupts = <35 1>;
        reg = <0>;
diff --git a/Documentation/devicetree/bindings/net/stmmac.txt b/Documentation/devicetree/bindings/net/stmmac.txt
index 1f62623f8c3f..060bbf098ef3 100644
--- a/Documentation/devicetree/bindings/net/stmmac.txt
+++ b/Documentation/devicetree/bindings/net/stmmac.txt
@@ -1,7 +1,8 @@
 * STMicroelectronics 10/100/1000 Ethernet driver (GMAC)
 Required properties:
- compatible: Should be "st,spear600-gmac"
+- compatible: Should be "snps,dwmac-<ip_version>" "snps,dwmac"
+        For backwards compatibility: "st,spear600-gmac" is also supported.
 - reg: Address and length of the register set for the device
 - interrupt-parent: Should be the phandle for the interrupt controller
  that services interrupts for this device
diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvidia,nvec.txt
index 5aeee53ff9f4..5aeee53ff9f4 100644
--- a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
+++ b/Documentation/devicetree/bindings/nvec/nvidia,nvec.txt
diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt
index 82b43f915857..a4119f6422d9 100644
--- a/Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx6q-pinctrl.txt
@@ -1626,3 +1626,5 @@ MX6Q_PAD_SD2_DAT3__PCIE_CTRL_MUX_11		1587
 MX6Q_PAD_SD2_DAT3__GPIO_1_12                    1588
 MX6Q_PAD_SD2_DAT3__SJC_DONE                     1589
 MX6Q_PAD_SD2_DAT3__ANATOP_TESTO_3               1590
+MX6Q_PAD_ENET_RX_ER__ANATOP_USBOTG_ID           1591
+MX6Q_PAD_GPIO_1__ANATOP_USBOTG_ID               1592
diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
new file mode 100644
index 000000000000..5187f0dd8b28
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt
@@ -0,0 +1,93 @@
+One-register-per-pin type device tree based pinctrl driver
+Required properties:
+- compatible : "pinctrl-single"
+- reg : offset and length of the register set for the mux registers
+- pinctrl-single,register-width : pinmux register access width in bits
+- pinctrl-single,function-mask : mask of allowed pinmux function bits
+  in the pinmux register
+Optional properties:
+- pinctrl-single,function-off : function off mode for disabled state if
+  available and same for all registers; if not specified, disabling of
+  pin functions is ignored
+This driver assumes that there is only one register for each pin,
+and uses the common pinctrl bindings as specified in the pinctrl-bindings.txt
+document in this directory.
+The pin configuration nodes for pinctrl-single are specified as pinctrl
+register offset and value pairs using pinctrl-single,pins. Only the bits
+specified in pinctrl-single,function-mask are updated. For example, setting
+a pin for a device could be done with:
+        pinctrl-single,pins = <0xdc 0x118>;
+Where 0xdc is the offset from the pinctrl register base address for the
+device pinctrl register, and 0x118 contains the desired value of the
+pinctrl register. See the device example and static board pins example
+below for more information.
+Example:
+/* SoC common file */
+/* first controller instance for pins in core domain */
+pmx_core: pinmux@4a100040 {
+        compatible = "pinctrl-single";
+        reg = <0x4a100040 0x0196>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        pinctrl-single,register-width = <16>;
+        pinctrl-single,function-mask = <0xffff>;
+};
+/* second controller instance for pins in wkup domain */
+pmx_wkup: pinmux@4a31e040 {
+        compatible = "pinctrl-single;
+        reg = <0x4a31e040 0x0038>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        pinctrl-single,register-width = <16>;
+        pinctrl-single,function-mask = <0xffff>;
+};
+/* board specific .dts file */
+&pmx_core {
+        /*
+         * map all board specific static pins enabled by the pinctrl driver
+         * itself during the boot (or just set them up in the bootloader)
+         */
+        pinctrl-names = "default";
+        pinctrl-0 = <&board_pins>;
+        board_pins: pinmux_board_pins {
+                pinctrl-single,pins = <
+                        0x6c 0xf
+                        0x6e 0xf
+                        0x70 0xf
+                        0x72 0xf
+                >;
+        };
+        /* map uart2 pins */
+        uart2_pins: pinmux_uart2_pins {
+                pinctrl-single,pins = <
+                        0xd8 0x118
+                        0xda 0
+                        0xdc 0x118
+                        0xde 0
+                >;
+        };
+};
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&uart2_pins>;
+};
diff --git a/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt b/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt
new file mode 100644
index 000000000000..cfe1db3bb6e9
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/lpc32xx-pwm.txt
@@ -0,0 +1,12 @@
+LPC32XX PWM controller
+Required properties:
+- compatible: should be "nxp,lpc3220-pwm"
+- reg: physical base address and length of the controller's registers
+Examples:
+pwm@0x4005C000 {
+        compatible = "nxp,lpc3220-pwm";
+        reg = <0x4005C000 0x8>;
+};
diff --git a/Documentation/devicetree/bindings/pwm/mxs-pwm.txt b/Documentation/devicetree/bindings/pwm/mxs-pwm.txt
new file mode 100644
index 000000000000..b16f4a57d111
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/mxs-pwm.txt
@@ -0,0 +1,17 @@
+Freescale MXS PWM controller
+Required properties:
+- compatible: should be "fsl,imx23-pwm"
+- reg: physical base address and length of the controller's registers
+- #pwm-cells: should be 2.  The first cell specifies the per-chip index
+  of the PWM to use and the second cell is the duty cycle in nanoseconds.
+- fsl,pwm-number: the number of PWM devices
+Example:
+pwm: pwm@80064000 {
+        compatible = "fsl,imx28-pwm", "fsl,imx23-pwm";
+        reg = <0x80064000 2000>;
+        #pwm-cells = <2>;
+        fsl,pwm-number = <8>;
+};
diff --git a/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt
new file mode 100644
index 000000000000..bbbeedb4ec05
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/nvidia,tegra20-pwm.txt
@@ -0,0 +1,18 @@
+Tegra SoC PWFM controller
+Required properties:
+- compatible: should be one of:
+  - "nvidia,tegra20-pwm"
+  - "nvidia,tegra30-pwm"
+- reg: physical base address and length of the controller's registers
+- #pwm-cells: On Tegra the number of cells used to specify a PWM is 2. The
+  first cell specifies the per-chip index of the PWM to use and the second
+  cell is the duty cycle in nanoseconds.
+Example:
+        pwm: pwm@7000a000 {
+                compatible = "nvidia,tegra20-pwm";
+                reg = <0x7000a000 0x100>;
+                #pwm-cells = <2>;
+        };
diff --git a/Documentation/devicetree/bindings/pwm/pwm.txt b/Documentation/devicetree/bindings/pwm/pwm.txt
new file mode 100644
index 000000000000..73ec962bfe8c
--- /dev/null
+++ b/Documentation/devicetree/bindings/pwm/pwm.txt
@@ -0,0 +1,57 @@
+Specifying PWM information for devices
+======================================
+1) PWM user nodes
+-----------------
+PWM users should specify a list of PWM devices that they want to use
+with a property containing a 'pwm-list':
+        pwm-list ::= <single-pwm> [pwm-list]
+        single-pwm ::= <pwm-phandle> <pwm-specifier>
+        pwm-phandle : phandle to PWM controller node
+        pwm-specifier : array of #pwm-cells specifying the given PWM
+                        (controller specific)
+PWM properties should be named "pwms". The exact meaning of each pwms
+property must be documented in the device tree binding for each device.
+An optional property "pwm-names" may contain a list of strings to label
+each of the PWM devices listed in the "pwms" property. If no "pwm-names"
+property is given, the name of the user node will be used as fallback.
+Drivers for devices that use more than a single PWM device can use the
+"pwm-names" property to map the name of the PWM device requested by the
+pwm_get() call to an index into the list given by the "pwms" property.
+The following example could be used to describe a PWM-based backlight
+device:
+        pwm: pwm {
+                #pwm-cells = <2>;
+        };
+        [...]
+        bl: backlight {
+                pwms = <&pwm 0 5000000>;
+                pwm-names = "backlight";
+        };
+pwm-specifier typically encodes the chip-relative PWM number and the PWM
+period in nanoseconds. Note that in the example above, specifying the
+"pwm-names" is redundant because the name "backlight" would be used as
+fallback anyway.
+2) PWM controller nodes
+-----------------------
+PWM controller nodes must specify the number of cells used for the
+specifier using the '#pwm-cells' property.
+An example PWM controller might look like this:
+        pwm: pwm@7000a000 {
+                compatible = "nvidia,tegra20-pwm";
+                reg = <0x7000a000 0x100>;
+                #pwm-cells = <2>;
+        };
diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
index 2f5b6b1ba15f..4fae41d54798 100644
--- a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
@@ -10,6 +10,7 @@ Optional properties:
 If this property is missing, the default assumed is Active low.
 - gpio-open-drain: GPIO is open drain type.
  If this property is missing then default assumption is false.
+-vin-supply: Input supply name.
 Any property defined as part of the core regulator
 binding, defined in regulator.txt, can also be used.
@@ -29,4 +30,5 @@ Example:
                enable-active-high;
                regulator-boot-on;
                gpio-open-drain;
+                vin-supply = <&parent_reg>;
        };
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 5b7a408acdaa..66ece3f87bbc 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -10,6 +10,11 @@ Optional properties:
 - regulator-always-on: boolean, regulator should never be disabled
 - regulator-boot-on: bootloader/firmware enabled regulator
 - <name>-supply: phandle to the parent supply/regulator node
+- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
+- regulator-compatible: If a regulator chip contains multiple
+  regulators, and if the chip's binding contains a child node that
+  describes each regulator, then this property indicates which regulator
+  this child node is intended to configure.
 Example:
diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt
new file mode 100644
index 000000000000..0487e9675ba0
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -0,0 +1,91 @@
+TPS65217 family of regulators
+Required properties:
+- compatible: "ti,tps65217"
+- reg: I2C slave address
+- regulators: list of regulators provided by this controller, must be named
+  after their hardware counterparts: dcdc[1-3] and ldo[1-4]
+- regulators: This is the list of child nodes that specify the regulator
+  initialization data for defined regulators. Not all regulators for the given
+  device need to be present. The definition for each of these nodes is defined
+  using the standard binding for regulators found at
+  Documentation/devicetree/bindings/regulator/regulator.txt.
+  The valid names for regulators are:
+  tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
+Each regulator is defined using the standard binding for regulators.
+Example:
+        tps: tps@24 {
+                compatible = "ti,tps65217";
+                regulators {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        dcdc1_reg: regulator@0 {
+                                reg = <0>;
+                                regulator-compatible = "dcdc1";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1800000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        dcdc2_reg: regulator@1 {
+                                reg = <1>;
+                                regulator-compatible = "dcdc2";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        dcdc3_reg: regulator@2 {
+                                reg = <2>;
+                                regulator-compatible = "dcdc3";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo1_reg: regulator@3 {
+                                reg = <3>;
+                                regulator-compatible = "ldo1";
+                                regulator-min-microvolt = <1000000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo2_reg: regulator@4 {
+                                reg = <4>;
+                                regulator-compatible = "ldo2";
+                                regulator-min-microvolt = <900000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo3_reg: regulator@5 {
+                                reg = <5>;
+                                regulator-compatible = "ldo3";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                        ldo4_reg: regulator@6 {
+                                reg = <6>;
+                                regulator-compatible = "ldo4";
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-boot-on;
+                                regulator-always-on;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt
index 0fcabaa3baa3..d156e1b5db12 100644
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@ -6,8 +6,17 @@ Required properties:
 - interrupts: the interrupt outputs of the controller
 - #gpio-cells: number of cells to describe a GPIO
 - gpio-controller: mark the device as a GPIO controller
- regulators: list of regulators provided by this controller, must be named
+- regulators: list of regulators provided by this controller, must have
-  after their hardware counterparts: sm[0-2], ldo[0-9] and ldo_rtc
+  property "regulator-compatible" to match their hardware counterparts:
+  sm[0-2], ldo[0-9] and ldo_rtc
+- sm0-supply: The input supply for the SM0.
+- sm1-supply: The input supply for the SM1.
+- sm2-supply: The input supply for the SM2.
+- vinldo01-supply: The input supply for the LDO1 and LDO2
+- vinldo23-supply: The input supply for the LDO2 and LDO3
+- vinldo4-supply: The input supply for the LDO4
+- vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
+- vinldo9-supply: The input supply for the LDO9
 Each regulator is defined using the standard binding for regulators.
@@ -21,75 +30,113 @@ Example:
                #gpio-cells = <2>;
                gpio-controller;
+                sm0-supply = <&some_reg>;
+                sm1-supply = <&some_reg>;
+                sm2-supply = <&some_reg>;
+                vinldo01-supply = <...>;
+                vinldo23-supply = <...>;
+                vinldo4-supply = <...>;
+                vinldo678-supply = <...>;
+                vinldo9-supply = <...>;
                regulators {
-                        sm0_reg: sm0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        sm0_reg: regulator@0 {
+                                reg = <0>;
+                                regulator-compatible = "sm0";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        sm1_reg: sm1 {
+                        sm1_reg: regulator@1 {
+                                reg = <1>;
+                                regulator-compatible = "sm1";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        sm2_reg: sm2 {
+                        sm2_reg: regulator@2 {
+                                reg = <2>;
+                                regulator-compatible = "sm2";
                                regulator-min-microvolt = <3000000>;
                                regulator-max-microvolt = <4550000>;
                                regulator-boot-on;
                                regulator-always-on;
                        };
-                        ldo0_reg: ldo0 {
+                        ldo0_reg: regulator@3 {
+                                reg = <3>;
+                                regulator-compatible = "ldo0";
                                regulator-name = "PCIE CLK";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo1_reg: ldo1 {
+                        ldo1_reg: regulator@4 {
+                                reg = <4>;
+                                regulator-compatible = "ldo1";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                        };
-                        ldo2_reg: ldo2 {
+                        ldo2_reg: regulator@5 {
+                                reg = <5>;
+                                regulator-compatible = "ldo2";
                                regulator-min-microvolt = < 725000>;
                                regulator-max-microvolt = <1500000>;
                        };
-                        ldo3_reg: ldo3 {
+                        ldo3_reg: regulator@6 {
+                                reg = <6>;
+                                regulator-compatible = "ldo3";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo4_reg: ldo4 {
+                        ldo4_reg: regulator@7 {
+                                reg = <7>;
+                                regulator-compatible = "ldo4";
                                regulator-min-microvolt = <1700000>;
                                regulator-max-microvolt = <2475000>;
                        };
-                        ldo5_reg: ldo5 {
+                        ldo5_reg: regulator@8 {
+                                reg = <8>;
+                                regulator-compatible = "ldo5";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo6_reg: ldo6 {
+                        ldo6_reg: regulator@9 {
+                                reg = <9>;
+                                regulator-compatible = "ldo6";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo7_reg: ldo7 {
+                        ldo7_reg: regulator@10 {
+                                reg = <10>;
+                                regulator-compatible = "ldo7";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo8_reg: ldo8 {
+                        ldo8_reg: regulator@11 {
+                                reg = <11>;
+                                regulator-compatible = "ldo8";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                        ldo9_reg: ldo9 {
+                        ldo9_reg: regulator@12 {
+                                reg = <12>;
+                                regulator-compatible = "ldo9";
                                regulator-min-microvolt = <1250000>;
                                regulator-max-microvolt = <3300000>;
                        };
diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
index 0c3395d55ac1..658749b90b97 100644
--- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt
@@ -15,7 +15,6 @@ For twl6030 regulators/LDOs
  - "ti,twl6030-vusb" for VUSB LDO
  - "ti,twl6030-v1v8" for V1V8 LDO
  - "ti,twl6030-v2v1" for V2V1 LDO
-  - "ti,twl6030-clk32kg" for CLK32KG RESOURCE
  - "ti,twl6030-vdd1" for VDD1 SMPS
  - "ti,twl6030-vdd2" for VDD2 SMPS
  - "ti,twl6030-vdd3" for VDD3 SMPS
diff --git a/Documentation/devicetree/bindings/rtc/dw-apb.txt b/Documentation/devicetree/bindings/rtc/dw-apb.txt
new file mode 100644
index 000000000000..93e2b0f048e6
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/dw-apb.txt
@@ -0,0 +1,25 @@
+* Designware APB timer
+Required properties:
+- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: IRQ line for the timer.
+- clock-frequency: The frequency in HZ of the timer.
+- clock-freq: For backwards compatibility with picoxcell
+Example:
+                timer1: timer@ffc09000 {
+                                compatible = "snps,dw-apb-timer-sp";
+                                interrupts = <0 168 4>;
+                                clock-frequency = <200000000>;
+                                reg = <0xffc09000 0x1000>;
+                        };
+                timer2: timer@ffd00000 {
+                                compatible = "snps,dw-apb-timer-osc";
+                                interrupts = <0 169 4>;
+                                clock-frequency = <200000000>;
+                                reg = <0xffd00000 0x1000>;
+                        };
diff --git a/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
new file mode 100644
index 000000000000..b800070fe6e9
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt
@@ -0,0 +1,16 @@
+* STMP3xxx/i.MX28 Time Clock controller
+Required properties:
+- compatible: should be one of the following.
+    * "fsl,stmp3xxx-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: rtc alarm interrupt
+Example:
+rtc@80056000 {
+        compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
+        reg = <0x80056000 2000>;
+        interrupts = <29>;
+};
diff --git a/Documentation/devicetree/bindings/serial/cavium-uart.txt b/Documentation/devicetree/bindings/serial/cavium-uart.txt
new file mode 100644
index 000000000000..87a6c375cd44
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/cavium-uart.txt
@@ -0,0 +1,19 @@
+* Universal Asynchronous Receiver/Transmitter (UART)
+- compatible: "cavium,octeon-3860-uart"
+  Compatibility with all cn3XXX, cn5XXX and cn6XXX SOCs.
+- reg: The base address of the UART register bank.
+- interrupts: A single interrupt specifier.
+- current-speed: Optional, the current bit rate in bits per second.
+Example:
+        uart1: serial@1180000000c00 {
+                compatible = "cavium,octeon-3860-uart","ns16550";
+                reg = <0x11800 0x00000c00 0x0 0x400>;
+                current-speed = <115200>;
+                interrupts = <0 35>;
+        };
diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
index b77a97c9101e..b77a97c9101e 100644
--- a/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
index 04b14cfb1f16..04b14cfb1f16 100644
--- a/Documentation/devicetree/bindings/sound/tegra-audio-trimslice.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
index c4dd39ce6165..c4dd39ce6165 100644
--- a/Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
index d5b0da8bf1d8..d5b0da8bf1d8 100644
--- a/Documentation/devicetree/bindings/sound/tegra-audio-wm8903.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra20-das.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt
index 6de3a7ee4efb..6de3a7ee4efb 100644
--- a/Documentation/devicetree/bindings/sound/tegra20-das.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra20-i2s.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt
index 0df2b5c816e3..0df2b5c816e3 100644
--- a/Documentation/devicetree/bindings/sound/tegra20-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt
diff --git a/Documentation/devicetree/bindings/spi/spi_nvidia.txt b/Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt
index 6b9e51896693..6b9e51896693 100644
--- a/Documentation/devicetree/bindings/spi/spi_nvidia.txt
+++ b/Documentation/devicetree/bindings/spi/nvidia,tegra20-spi.txt
diff --git a/Documentation/devicetree/bindings/spi/spi-orion.txt b/Documentation/devicetree/bindings/spi/spi-orion.txt
new file mode 100644
index 000000000000..a3ff50fc76fb
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-orion.txt
@@ -0,0 +1,19 @@
+Marvell Orion SPI device
+Required properties:
+- compatible : should be "marvell,orion-spi".
+- reg : offset and length of the register set for the device
+- cell-index : Which of multiple SPI controllers is this.
+Optional properties:
+- interrupts : Is currently not used.
+Example:
+       spi@10600 {
+               compatible = "marvell,orion-spi";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               cell-index = <0>;
+               reg = <0x10600 0x28>;
+               interrupts = <23>;
+               status = "disabled";
+       };
diff --git a/Documentation/devicetree/bindings/spi/spi-samsung.txt b/Documentation/devicetree/bindings/spi/spi-samsung.txt
new file mode 100644
index 000000000000..a15ffeddfba4
--- /dev/null
+++ b/Documentation/devicetree/bindings/spi/spi-samsung.txt
@@ -0,0 +1,116 @@
+* Samsung SPI Controller
+The Samsung SPI controller is used to interface with various devices such as flash
+and display controllers using the SPI communication interface.
+Required SoC Specific Properties:
+- compatible: should be one of the following.
+    - samsung,s3c2443-spi: for s3c2443, s3c2416 and s3c2450 platforms
+    - samsung,s3c6410-spi: for s3c6410 platforms
+    - samsung,s5p6440-spi: for s5p6440 and s5p6450 platforms
+    - samsung,s5pv210-spi: for s5pv210 and s5pc110 platforms
+    - samsung,exynos4210-spi: for exynos4 and exynos5 platforms
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: The interrupt number to the cpu. The interrupt specifier format
+  depends on the interrupt controller.
+[PRELIMINARY: the dma channel allocation will change once there are
+official DMA bindings]
+- tx-dma-channel: The dma channel specifier for tx operations. The format of
+  the dma specifier depends on the dma controller.
+- rx-dma-channel: The dma channel specifier for rx operations. The format of
+  the dma specifier depends on the dma controller.
+Required Board Specific Properties:
+- #address-cells: should be 1.
+- #size-cells: should be 0.
+- gpios: The gpio specifier for clock, mosi and miso interface lines (in the
+  order specified). The format of the gpio specifier depends on the gpio
+  controller.
+Optional Board Specific Properties:
+- samsung,spi-src-clk: If the spi controller includes a internal clock mux to
+  select the clock source for the spi bus clock, this property can be used to
+  indicate the clock to be used for driving the spi bus clock. If not specified,
+  the clock number 0 is used as default.
+- num-cs: Specifies the number of chip select lines supported. If
+  not specified, the default number of chip select lines is set to 1.
+SPI Controller specific data in SPI slave nodes:
+- The spi slave nodes should provide the following information which is required
+  by the spi controller.
+  - cs-gpio: A gpio specifier that specifies the gpio line used as
+    the slave select line by the spi controller. The format of the gpio
+    specifier depends on the gpio controller.
+  - samsung,spi-feedback-delay: The sampling phase shift to be applied on the
+    miso line (to account for any lag in the miso line). The following are the
+    valid values.
+      - 0: No phase shift.
+      - 1: 90 degree phase shift sampling.
+      - 2: 180 degree phase shift sampling.
+      - 3: 270 degree phase shift sampling.
+Aliases:
+- All the SPI controller nodes should be represented in the aliases node using
+  the following format 'spi{n}' where n is a unique number for the alias.
+Example:
+- SoC Specific Portion:
+        spi_0: spi@12d20000 {
+                compatible = "samsung,exynos4210-spi";
+                reg = <0x12d20000 0x100>;
+                interrupts = <0 66 0>;
+                tx-dma-channel = <&pdma0 5>;
+                rx-dma-channel = <&pdma0 4>;
+        };
+- Board Specific Portion:
+        spi_0: spi@12d20000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                gpios = <&gpa2 4 2 3 0>,
+                        <&gpa2 6 2 3 0>,
+                        <&gpa2 7 2 3 0>;
+                w25q80bw@0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "w25x80";
+                        reg = <0>;
+                        spi-max-frequency = <10000>;
+                        controller-data {
+                                cs-gpio = <&gpa2 5 1 0 3>;
+                                samsung,spi-feedback-delay = <0>;
+                        };
+                        partition@0 {
+                                label = "U-Boot";
+                                reg = <0x0 0x40000>;
+                                read-only;
+                        };
+                        partition@40000 {
+                                label = "Kernel";
+                                reg = <0x40000 0xc0000>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/thermal/spear-thermal.txt b/Documentation/devicetree/bindings/thermal/spear-thermal.txt
new file mode 100644
index 000000000000..93e3b67c102d
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/spear-thermal.txt
@@ -0,0 +1,14 @@
+* SPEAr Thermal
+Required properties:
+- compatible : "st,thermal-spear1340"
+- reg : Address range of the thermal registers
+- st,thermal-flags: flags used to enable thermal sensor
+Example:
+        thermal@fc000000 {
+                compatible = "st,thermal-spear1340";
+                reg = <0xfc000000 0x1000>;
+                st,thermal-flags = <0x7000>;
+        };
diff --git a/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt b/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt
new file mode 100644
index 000000000000..2ee903fad25c
--- /dev/null
+++ b/Documentation/devicetree/bindings/tty/serial/fsl-mxs-auart.txt
@@ -0,0 +1,27 @@
+* Freescale MXS Application UART (AUART)
+Required properties:
+- compatible : Should be "fsl,<soc>-auart". The supported SoCs include
+  imx23 and imx28.
+- reg : Address and length of the register set for the device
+- interrupts : Should contain the auart interrupt numbers
+Example:
+auart0: serial@8006a000 {
+        compatible = "fsl,imx28-auart", "fsl,imx23-auart";
+        reg = <0x8006a000 0x2000>;
+        interrupts = <112 70 71>;
+};
+Note: Each auart port should have an alias correctly numbered in "aliases"
+node.
+Example:
+aliases {
+        serial0 = &auart0;
+        serial1 = &auart1;
+        serial2 = &auart2;
+        serial3 = &auart3;
+        serial4 = &auart4;
+};
diff --git a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
new file mode 100644
index 000000000000..2c290418bb2d
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt
@@ -0,0 +1,18 @@
+* Freescale i.MX ci13xxx usb controllers
+Required properties:
+- compatible: Should be "fsl,imx27-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+Optional properties:
+- fsl,usbphy: phandler of usb phy that connects to the only one port
+- vbus-supply: regulator for vbus
+Examples:
+usb@02184000 { /* USB OTG */
+        compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+        reg = <0x02184000 0x200>;
+        interrupts = <0 43 0x04>;
+        fsl,usbphy = <&usbphy1>;
+};
diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt
new file mode 100644
index 000000000000..5835b27146ea
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@ -0,0 +1,13 @@
+* Freescale MXS USB Phy Device
+Required properties:
+- compatible: Should be "fsl,imx23-usbphy"
+- reg: Should contain registers location and length
+- interrupts: Should contain phy interrupt
+Example:
+usbphy1: usbphy@020c9000 {
+        compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
+        reg = <0x020c9000 0x1000>;
+        interrupts = <0 44 0x04>;
+};
diff --git a/Documentation/devicetree/bindings/usb/tegra-usb.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
index e9b005dc7625..e9b005dc7625 100644
--- a/Documentation/devicetree/bindings/usb/tegra-usb.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-ehci.txt
diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt b/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
new file mode 100644
index 000000000000..1e4fc727f3b1
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt
@@ -0,0 +1,28 @@
+pwm-backlight bindings
+Required properties:
+  - compatible: "pwm-backlight"
+  - pwms: OF device-tree PWM specification (see PWM binding[0])
+  - brightness-levels: Array of distinct brightness levels. Typically these
+      are in the range from 0 to 255, but any range starting at 0 will do.
+      The actual brightness level (PWM duty cycle) will be interpolated
+      from these values. 0 means a 0% duty cycle (darkest/off), while the
+      last value in the array represents a 100% duty cycle (brightest).
+  - default-brightness-level: the default brightness level (index into the
+      array defined by the "brightness-levels" property)
+Optional properties:
+  - pwm-names: a list of names for the PWM devices specified in the
+               "pwms" property (see PWM binding[0])
+[0]: Documentation/devicetree/bindings/pwm/pwm.txt
+Example:
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 0 5000000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+        };
diff --git a/Documentation/devicetree/bindings/watchdog/marvel.txt b/Documentation/devicetree/bindings/watchdog/marvel.txt
new file mode 100644
index 000000000000..0b2503ab0a05
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/marvel.txt
@@ -0,0 +1,14 @@
+* Marvell Orion Watchdog Time
+Required Properties:
+- Compatibility : "marvell,orion-wdt"
+- reg           : Address of the timer registers
+Example:
+        wdt@20300 {
+                compatible = "marvell,orion-wdt";
+                reg = <0x20300 0x28>;
+                status = "okay";
+        };
diff --git a/Documentation/devicetree/bindings/watchdog/omap-wdt.txt b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt
new file mode 100644
index 000000000000..c227970671ea
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/omap-wdt.txt
@@ -0,0 +1,14 @@
+TI Watchdog Timer (WDT) Controller for OMAP
+Required properties:
+compatible:
+- "ti,omap3-wdt" for OMAP3
+- "ti,omap4-wdt" for OMAP4
+- ti,hwmods: Name of the hwmod associated to the WDT
+Examples:
+wdt2: wdt@4a314000 {
+        compatible = "ti,omap4-wdt", "ti,omap3-wdt";
+        ti,hwmods = "wd_timer2";
+};
diff --git a/Documentation/devicetree/usage-model.txt b/Documentation/devicetree/usage-model.txt
index c5a80099b71c..dca90fe22a90 100644
--- a/Documentation/devicetree/usage-model.txt
+++ b/Documentation/devicetree/usage-model.txt
@@ -312,7 +312,7 @@ device tree for the NVIDIA Tegra board.
        };
 };
-At .machine_init() time, Tegra board support code will need to look at
+At .init_machine() time, Tegra board support code will need to look at
 this DT and decide which nodes to create platform_devices for.
 However, looking at the tree, it is not immediately obvious what kind
 of device each node represents, or even if a node represents a device
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index b4a898f43c37..39462cf35cd4 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -150,7 +150,6 @@ keywords.c
 ksym.c*
 ksym.h*
 kxgettext
-lkc_defs.h
 lex.c
 lex.*.c
 linux
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index fbb241174486..12d3952e83d5 100755
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -29,7 +29,7 @@ use IO::Handle;
                "af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395",
                "lme2510c_s7395_old", "drxk", "drxk_terratec_h5",
                "drxk_hauppauge_hvr930c", "tda10071", "it9135", "it9137",
-                "drxk_pctv");
+                "drxk_pctv", "drxk_terratec_htc_stick", "sms1xxx_hcw");
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -676,6 +676,24 @@ sub drxk_terratec_h5 {
    "$fwfile"
 }
+sub drxk_terratec_htc_stick {
+    my $url = "http://ftp.terratec.de/Receiver/Cinergy_HTC_Stick/Updates/";
+    my $zipfile = "Cinergy_HTC_Stick_Drv_5.09.1202.00_XP_Vista_7.exe";
+    my $hash = "6722a2442a05423b781721fbc069ed5e";
+    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 0);
+    my $drvfile = "Cinergy HTC Stick/BDA Driver 5.09.1202.00/Windows 32 Bit/emOEM.sys";
+    my $fwfile = "dvb-usb-terratec-htc-stick-drxk.fw";
+    checkstandard();
+    wgetfile($zipfile, $url . $zipfile);
+    verify($zipfile, $hash);
+    unzip($zipfile, $tmpdir);
+    extract("$tmpdir/$drvfile", 0x4e5c0, 42692, "$fwfile");
+    "$fwfile"
+}
 sub it9135 {
        my $sourcefile = "dvb-usb-it9135.zip";
        my $url = "http://www.ite.com.tw/uploads/firmware/v3.6.0.0/$sourcefile";
@@ -748,6 +766,28 @@ sub drxk_pctv {
    "$fwfile";
 }
+sub sms1xxx_hcw {
+    my $url = "http://steventoth.net/linux/sms1xxx/";
+    my %files = (
+        'sms1xxx-hcw-55xxx-dvbt-01.fw'  => "afb6f9fb9a71d64392e8564ef9577e5a",
+        'sms1xxx-hcw-55xxx-dvbt-02.fw'  => "b44807098ba26e52cbedeadc052ba58f",
+        'sms1xxx-hcw-55xxx-isdbt-02.fw' => "dae934eeea85225acbd63ce6cfe1c9e4",
+    );
+    checkstandard();
+    my $allfiles;
+    foreach my $fwfile (keys %files) {
+        wgetfile($fwfile, "$url/$fwfile");
+        verify($fwfile, $files{$fwfile});
+        $allfiles .= " $fwfile";
+    }
+    $allfiles =~ s/^\s//;
+    $allfiles;
+}
 # ---------------------------------------------------------------
 # Utilities
diff --git a/Documentation/edac.txt b/Documentation/edac.txt
index 03df2b020332..56c7e936430f 100644
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
@@ -232,116 +232,20 @@ EDAC control and attribute files.
 In 'mcX' directories are EDAC control and attribute files for
-this 'X' instance of the memory controllers:
+this 'X' instance of the memory controllers.
-Counter reset control file:
-        'reset_counters'
-        This write-only control file will zero all the statistical counters
-        for UE and CE errors.  Zeroing the counters will also reset the timer
-        indicating how long since the last counter zero.  This is useful
-        for computing errors/time.  Since the counters are always reset at
-        driver initialization time, no module/kernel parameter is available.
-        RUN TIME: echo "anything" >/sys/devices/system/edac/mc/mc0/counter_reset
-                This resets the counters on memory controller 0
-Seconds since last counter reset control file:
-        'seconds_since_reset'
-        This attribute file displays how many seconds have elapsed since the
-        last counter reset. This can be used with the error counters to
-        measure error rates.
-Memory Controller name attribute file:
-        'mc_name'
-        This attribute file displays the type of memory controller
-        that is being utilized.
-Total memory managed by this memory controller attribute file:
-        'size_mb'
-        This attribute file displays, in count of megabytes, of memory
-        that this instance of memory controller manages.
-Total Uncorrectable Errors count attribute file:
-        'ue_count'
-        This attribute file displays the total count of uncorrectable
-        errors that have occurred on this memory controller. If panic_on_ue
-        is set this counter will not have a chance to increment,
-        since EDAC will panic the system.
-Total UE count that had no information attribute fileY:
-        'ue_noinfo_count'
-        This attribute file displays the number of UEs that have occurred
-        with no information as to which DIMM slot is having errors.
-Total Correctable Errors count attribute file:
-        'ce_count'
-        This attribute file displays the total count of correctable
-        errors that have occurred on this memory controller. This
-        count is very important to examine. CEs provide early
-        indications that a DIMM is beginning to fail. This count
-        field should be monitored for non-zero values and report
-        such information to the system administrator.
-Total Correctable Errors count attribute file:
-        'ce_noinfo_count'
-        This attribute file displays the number of CEs that
-        have occurred wherewith no information as to which DIMM slot
-        is having errors. Memory is handicapped, but operational,
-        yet no information is available to indicate which slot
-        the failing memory is in. This count field should be also
-        be monitored for non-zero values.
-Device Symlink:
-        'device'
-        Symlink to the memory controller device.
-Sdram memory scrubbing rate:
-        'sdram_scrub_rate'
-        Read/Write attribute file that controls memory scrubbing. The scrubbing
-        rate is set by writing a minimum bandwidth in bytes/sec to the attribute
-        file. The rate will be translated to an internal value that gives at
-        least the specified rate.
-        Reading the file will return the actual scrubbing rate employed.
-        If configuration fails or memory scrubbing is not implemented, accessing
-        that attribute will fail.
+For a description of the sysfs API, please see:
+        Documentation/ABI/testing/sysfs/devices-edac
 ============================================================================
 'csrowX' DIRECTORIES
+When CONFIG_EDAC_LEGACY_SYSFS is enabled, the sysfs will contain the
+csrowX directories. As this API doesn't work properly for Rambus, FB-DIMMs
+and modern Intel Memory Controllers, this is being deprecated in favor
+of dimmX directories.
 In the 'csrowX' directories are EDAC control and attribute files for
 this 'X' instance of csrow:
diff --git a/Documentation/fault-injection/fault-injection.txt b/Documentation/fault-injection/fault-injection.txt
index ba4be8b77093..4cf1a2a6bd72 100644
--- a/Documentation/fault-injection/fault-injection.txt
+++ b/Documentation/fault-injection/fault-injection.txt
@@ -240,3 +240,30 @@ trap "echo 0 > /sys/kernel/debug/$FAILTYPE/probability" SIGINT SIGTERM EXIT
 echo "Injecting errors into the module $module... (interrupt to stop)"
 sleep 1000000
+Tool to run command with failslab or fail_page_alloc
+----------------------------------------------------
+In order to make it easier to accomplish the tasks mentioned above, we can use
+tools/testing/fault-injection/failcmd.sh.  Please run a command
+"./tools/testing/fault-injection/failcmd.sh --help" for more information and
+see the following examples.
+Examples:
+Run a command "make -C tools/testing/selftests/ run_tests" with injecting slab
+allocation failure.
+        # ./tools/testing/fault-injection/failcmd.sh \
+                -- make -C tools/testing/selftests/ run_tests
+Same as above except to specify 100 times failures at most instead of one time
+at most by default.
+        # ./tools/testing/fault-injection/failcmd.sh --times=100 \
+                -- make -C tools/testing/selftests/ run_tests
+Same as above except to inject page allocation failure instead of slab
+allocation failure.
+        # env FAILCMD_TYPE=fail_page_alloc \
+                ./tools/testing/fault-injection/failcmd.sh --times=100 \
+                -- make -C tools/testing/selftests/ run_tests
diff --git a/Documentation/fault-injection/notifier-error-inject.txt b/Documentation/fault-injection/notifier-error-inject.txt
new file mode 100644
index 000000000000..c83526c364e5
--- /dev/null
+++ b/Documentation/fault-injection/notifier-error-inject.txt
@@ -0,0 +1,99 @@
+Notifier error injection
+========================
+Notifier error injection provides the ability to inject artifical errors to
+specified notifier chain callbacks. It is useful to test the error handling of
+notifier call chain failures which is rarely executed.  There are kernel
+modules that can be used to test the following notifiers.
+ * CPU notifier
+ * PM notifier
+ * Memory hotplug notifier
+ * powerpc pSeries reconfig notifier
+CPU notifier error injection module
+-----------------------------------
+This feature can be used to test the error handling of the CPU notifiers by
+injecting artifical errors to CPU notifier chain callbacks.
+If the notifier call chain should be failed with some events notified, write
+the error code to debugfs interface
+/sys/kernel/debug/notifier-error-inject/cpu/actions/<notifier event>/error
+Possible CPU notifier events to be failed are:
+ * CPU_UP_PREPARE
+ * CPU_UP_PREPARE_FROZEN
+ * CPU_DOWN_PREPARE
+ * CPU_DOWN_PREPARE_FROZEN
+Example1: Inject CPU offline error (-1 == -EPERM)
+        # cd /sys/kernel/debug/notifier-error-inject/cpu
+        # echo -1 > actions/CPU_DOWN_PREPARE/error
+        # echo 0 > /sys/devices/system/cpu/cpu1/online
+        bash: echo: write error: Operation not permitted
+Example2: inject CPU online error (-2 == -ENOENT)
+        # echo -2 > actions/CPU_UP_PREPARE/error
+        # echo 1 > /sys/devices/system/cpu/cpu1/online
+        bash: echo: write error: No such file or directory
+PM notifier error injection module
+----------------------------------
+This feature is controlled through debugfs interface
+/sys/kernel/debug/notifier-error-inject/pm/actions/<notifier event>/error
+Possible PM notifier events to be failed are:
+ * PM_HIBERNATION_PREPARE
+ * PM_SUSPEND_PREPARE
+ * PM_RESTORE_PREPARE
+Example: Inject PM suspend error (-12 = -ENOMEM)
+        # cd /sys/kernel/debug/notifier-error-inject/pm/
+        # echo -12 > actions/PM_SUSPEND_PREPARE/error
+        # echo mem > /sys/power/state
+        bash: echo: write error: Cannot allocate memory
+Memory hotplug notifier error injection module
+----------------------------------------------
+This feature is controlled through debugfs interface
+/sys/kernel/debug/notifier-error-inject/memory/actions/<notifier event>/error
+Possible memory notifier events to be failed are:
+ * MEM_GOING_ONLINE
+ * MEM_GOING_OFFLINE
+Example: Inject memory hotplug offline error (-12 == -ENOMEM)
+        # cd /sys/kernel/debug/notifier-error-inject/memory
+        # echo -12 > actions/MEM_GOING_OFFLINE/error
+        # echo offline > /sys/devices/system/memory/memoryXXX/state
+        bash: echo: write error: Cannot allocate memory
+powerpc pSeries reconfig notifier error injection module
+--------------------------------------------------------
+This feature is controlled through debugfs interface
+/sys/kernel/debug/notifier-error-inject/pSeries-reconfig/actions/<notifier event>/error
+Possible pSeries reconfig notifier events to be failed are:
+ * PSERIES_RECONFIG_ADD
+ * PSERIES_RECONFIG_REMOVE
+ * PSERIES_DRCONF_MEM_ADD
+ * PSERIES_DRCONF_MEM_REMOVE
+For more usage examples
+-----------------------
+There are tools/testing/selftests using the notifier error injection features
+for CPU and memory notifiers.
+ * tools/testing/selftests/cpu-hotplug/on-off-test.sh
+ * tools/testing/selftests/memory-hotplug/on-off-test.sh
+These scripts first do simple online and offline tests and then do fault
+injection tests if notifier error injection module is available.
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 56000b33340b..afaff312bf41 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -13,6 +13,14 @@ Who:	Jim Cromie <jim.cromie@gmail.com>, Jason Baron <jbaron@redhat.com>
 ---------------------------
+What: /proc/sys/vm/nr_pdflush_threads
+When: 2012
+Why: Since pdflush is deprecated, the interface exported in /proc/sys/vm/
+     should be removed.
+Who: Wanpeng Li <liwp@linux.vnet.ibm.com>
+---------------------------
 What:   CONFIG_APM_CPU_IDLE, and its ability to call APM BIOS in idle
 When:   2012
 Why:    This optional sub-feature of APM is of dubious reliability,
@@ -70,20 +78,6 @@ Who:	Luis R. Rodriguez <lrodriguez@atheros.com>
 ---------------------------
-What:   IRQF_SAMPLE_RANDOM
-Check:  IRQF_SAMPLE_RANDOM
-When:   July 2009
-Why:    Many of IRQF_SAMPLE_RANDOM users are technically bogus as entropy
-        sources in the kernel's current entropy model. To resolve this, every
-        input point to the kernel's entropy pool needs to better document the
-        type of entropy source it actually is. This will be replaced with
-        additional add_*_randomness functions in drivers/char/random.c
-Who:    Robin Getz <rgetz@blackfin.uclinux.org> & Matt Mackall <mpm@selenic.com>
---------------------------
 What:   The ieee80211_regdom module parameter
 When:   March 2010 / desktop catchup
@@ -249,15 +243,6 @@ Who:	Ravikiran Thirumalai <kiran@scalex86.org>
 ---------------------------
-What:   Code that is now under CONFIG_WIRELESS_EXT_SYSFS
-        (in net/core/net-sysfs.c)
-When:   3.5
-Why:    Over 1K .text/.data size reduction, data is available in other
-        ways (ioctls)
-Who:    Johannes Berg <johannes@sipsolutions.net>
---------------------------
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -414,21 +399,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 ----------------------------
-What:   xt_connlimit rev 0
-When:   2012
-Who:    Jan Engelhardt <jengelh@medozas.de>
-Files:  net/netfilter/xt_connlimit.c
----------------------------
-What:   ipt_addrtype match include file
-When:   2012
-Why:    superseded by xt_addrtype
-Who:    Florian Westphal <fw@strlen.de>
-Files:  include/linux/netfilter_ipv4/ipt_addrtype.h
----------------------------
 What:   i2c_driver.attach_adapter
        i2c_driver.detach_adapter
 When:   September 2011
@@ -449,6 +419,19 @@ Who:	Hans Verkuil <hans.verkuil@cisco.com>
 ----------------------------
+What:   CONFIG_CFG80211_WEXT
+When:   as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
+        and NetworkManager/connman/etc. that are able to use nl80211
+Why:    Wireless extensions are deprecated, and userland tools are moving to
+        using nl80211. New drivers are no longer using wireless extensions,
+        and while there might still be old drivers, both new drivers and new
+        userland no longer needs them and they can't be used for an feature
+        developed in the past couple of years. As such, compatibility with
+        wireless extensions in new drivers will be removed.
+Who:    Johannes Berg <johannes@sipsolutions.net>
+----------------------------
 What:   g_file_storage driver
 When:   3.8
 Why:    This driver has been superseded by g_mass_storage.
@@ -523,14 +506,6 @@ Who:	Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 ----------------------------
-What:   kmap_atomic(page, km_type)
-When:   3.5
-Why:    The old kmap_atomic() with two arguments is deprecated, we only
-        keep it for backward compatibility for few cycles and then drop it.
-Who:    Cong Wang <amwang@redhat.com>
----------------------------
 What:   get_robust_list syscall
 When:   2013
 Why:    There appear to be no production users of the get_robust_list syscall,
@@ -589,6 +564,13 @@ Why:	Remount currently allows changing bound subsystems and
 ----------------------------
+What:  xt_recent rev 0
+When:  2013
+Who:   Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+----------------------------
 What:   KVM debugfs statistics
 When:   2013
 Why:    KVM tracepoints provide mostly equivalent information in a much more
@@ -612,3 +594,46 @@ When:	June 2013
 Why:    Unsupported/unmaintained/unused since 2.6
 ----------------------------
+What:   V4L2 selections API target rectangle and flags unification, the
+        following definitions will be removed: V4L2_SEL_TGT_CROP_ACTIVE,
+        V4L2_SEL_TGT_COMPOSE_ACTIVE, V4L2_SUBDEV_SEL_*, V4L2_SUBDEV_SEL_FLAG_*
+        in favor of common V4L2_SEL_TGT_* and V4L2_SEL_FLAG_* definitions.
+        For more details see include/linux/v4l2-common.h.
+When:   3.8
+Why:    The regular V4L2 selections and the subdev selection API originally
+        defined distinct names for the target rectangles and flags - V4L2_SEL_*
+        and V4L2_SUBDEV_SEL_*. Although, it turned out that the meaning of these
+        target rectangles is virtually identical and the APIs were consolidated
+        to use single set of names - V4L2_SEL_*. This didn't involve any ABI
+        changes. Alias definitions were created for the original ones to avoid
+        any instabilities in the user space interface. After few cycles these
+        backward compatibility definitions will be removed.
+Who:    Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
+----------------------------
+What:   Using V4L2_CAP_VIDEO_CAPTURE and V4L2_CAP_VIDEO_OUTPUT flags
+        to indicate a V4L2 memory-to-memory device capability
+When:   3.8
+Why:    New drivers should use new V4L2_CAP_VIDEO_M2M capability flag
+        to indicate a V4L2 video memory-to-memory (M2M) device and
+        applications can now identify a M2M video device by checking
+        for V4L2_CAP_VIDEO_M2M, with VIDIOC_QUERYCAP ioctl. Using ORed
+        V4L2_CAP_VIDEO_CAPTURE and V4L2_CAP_VIDEO_OUTPUT flags for M2M
+        devices is ambiguous and may lead, for example, to identifying
+        a M2M device as a video capture or output device.
+Who:    Sylwester Nawrocki <s.nawrocki@samsung.com>
+----------------------------
+What:   OMAP private DMA implementation
+When:   2013
+Why:    We have a DMA engine implementation; all users should be updated
+        to use this rather than persisting with the old APIs.  The old APIs
+        block merging the old DMA engine implementation into the DMA
+        engine driver.
+Who:    Russell King <linux@arm.linux.org.uk>,
+        Santosh Shilimkar <santosh.shilimkar@ti.com>
+----------------------------
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 8e2da1e06e3b..0f103e39b4f6 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -9,7 +9,7 @@ be able to use diff(1).
 --------------------------- dentry_operations --------------------------
 prototypes:
-        int (*d_revalidate)(struct dentry *, struct nameidata *);
+        int (*d_revalidate)(struct dentry *, unsigned int);
        int (*d_hash)(const struct dentry *, const struct inode *,
                        struct qstr *);
        int (*d_compare)(const struct dentry *, const struct inode *,
@@ -37,9 +37,8 @@ d_manage:	no		no		yes (ref-walk)	maybe
 --------------------------- inode_operations --------------------------- 
 prototypes:
-        int (*create) (struct inode *,struct dentry *,umode_t, struct nameidata *);
+        int (*create) (struct inode *,struct dentry *,umode_t, bool);
-        struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameid
+        struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
-ata *);
        int (*link) (struct dentry *,struct inode *,struct dentry *);
        int (*unlink) (struct inode *,struct dentry *);
        int (*symlink) (struct inode *,struct dentry *,const char *);
@@ -62,6 +61,9 @@ ata *);
        int (*removexattr) (struct dentry *, const char *);
        int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
        void (*update_time)(struct inode *, struct timespec *, int);
+        int (*atomic_open)(struct inode *, struct dentry *,
+                                struct file *, unsigned open_flag,
+                                umode_t create_mode, int *opened);
 locking rules:
        all may block
@@ -89,6 +91,7 @@ listxattr:	no
 removexattr:    yes
 fiemap:         no
 update_time:    no
+atomic_open:    yes
        Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on
 victim.
@@ -135,8 +138,8 @@ evict_inode:
 put_super:              write
 write_super:            read
 sync_fs:                read
-freeze_fs:              read
+freeze_fs:              write
-unfreeze_fs:            read
+unfreeze_fs:            write
 statfs:                 maybe(read)     (see below)
 remount_fs:             write
 umount_begin:           no
@@ -203,6 +206,8 @@ prototypes:
        int (*launder_page)(struct page *);
        int (*is_partially_uptodate)(struct page *, read_descriptor_t *, unsigned long);
        int (*error_remove_page)(struct address_space *, struct page *);
+        int (*swap_activate)(struct file *);
+        int (*swap_deactivate)(struct file *);
 locking rules:
        All except set_page_dirty and freepage may block
@@ -226,6 +231,8 @@ migratepage:		yes (both)
 launder_page:           yes
 is_partially_uptodate:  yes
 error_remove_page:      yes
+swap_activate:          no
+swap_deactivate:        no
        ->write_begin(), ->write_end(), ->sync_page() and ->readpage()
 may be called from the request handler (/dev/loop).
@@ -327,6 +334,15 @@ cleaned, or an error value if not. Note that in order to prevent the page
 getting mapped back in and redirtied, it needs to be kept locked
 across the entire operation.
+        ->swap_activate will be called with a non-zero argument on
+files backing (non block device backed) swapfiles. A return value
+of zero indicates success, in which case this file can be used for
+backing swapspace. The swapspace operations will be proxied to the
+address space operations.
+        ->swap_deactivate() will be called in the sys_swapoff()
+path after ->swap_activate() returned success.
 ----------------------- file_lock_operations ------------------------------
 prototypes:
        void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
@@ -343,7 +359,6 @@ prototypes:
        int (*lm_compare_owner)(struct file_lock *, struct file_lock *);
        void (*lm_notify)(struct file_lock *);  /* unblock callback */
        int (*lm_grant)(struct file_lock *, struct file_lock *, int);
-        void (*lm_release_private)(struct file_lock *);
        void (*lm_break)(struct file_lock *); /* break_lease callback */
        int (*lm_change)(struct file_lock **, int);
@@ -352,7 +367,6 @@ locking rules:
 lm_compare_owner:       yes             no
 lm_notify:              yes             no
 lm_grant:               no              no
-lm_release_private:     maybe           no
 lm_break:               yes             no
 lm_change               yes             no
diff --git a/Documentation/filesystems/porting b/Documentation/filesystems/porting
index 8c91d1057d9a..2bef2b3843d1 100644
--- a/Documentation/filesystems/porting
+++ b/Documentation/filesystems/porting
@@ -355,12 +355,10 @@ protects *all* the dcache state of a given dentry.
 via rcu-walk path walk (basically, if the file can have had a path name in the
 vfs namespace).
-        i_dentry and i_rcu share storage in a union, and the vfs expects
+        Even though i_dentry and i_rcu share storage in a union, we will
-i_dentry to be reinitialized before it is freed, so an:
+initialize the former in inode_init_always(), so just leave it alone in
+the callback.  It used to be necessary to clean it there, but not anymore
-  INIT_LIST_HEAD(&inode->i_dentry);
+(starting at 3.2).
-must be done in the RCU callback.
 --
 [recommended]
@@ -433,3 +431,14 @@ release it yourself.
        d_alloc_root() is gone, along with a lot of bugs caused by code
 misusing it.  Replacement: d_make_root(inode).  The difference is,
 d_make_root() drops the reference to inode if dentry allocation fails.  
+--
+[mandatory]
+        The witch is dead!  Well, 2/3 of it, anyway.  ->d_revalidate() and
+->lookup() do *not* take struct nameidata anymore; just the flags.
+--
+[mandatory]
+        ->create() doesn't take struct nameidata *; unlike the previous
+two, it gets "is it an O_EXCL or equivalent?" boolean argument.  Note that
+local filesystems can ignore tha argument - they are guaranteed that the
+object doesn't exist.  It's remote/distributed ones that might care...
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index efd23f481704..065aa2dc0835 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -341,8 +341,8 @@ This describes how the VFS can manipulate an inode in your
 filesystem. As of kernel 2.6.22, the following members are defined:
 struct inode_operations {
-        int (*create) (struct inode *,struct dentry *, umode_t, struct nameidata *);
+        int (*create) (struct inode *,struct dentry *, umode_t, bool);
-        struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+        struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
        int (*link) (struct dentry *,struct inode *,struct dentry *);
        int (*unlink) (struct inode *,struct dentry *);
        int (*symlink) (struct inode *,struct dentry *,const char *);
@@ -364,6 +364,9 @@ struct inode_operations {
        ssize_t (*listxattr) (struct dentry *, char *, size_t);
        int (*removexattr) (struct dentry *, const char *);
        void (*update_time)(struct inode *, struct timespec *, int);
+        int (*atomic_open)(struct inode *, struct dentry *,
+                                struct file *, unsigned open_flag,
+                                umode_t create_mode, int *opened);
 };
 Again, all methods are called without any locks being held, unless
@@ -476,6 +479,14 @@ otherwise noted.
        an inode.  If this is not defined the VFS will update the inode itself
        and call mark_inode_dirty_sync.
+  atomic_open: called on the last component of an open.  Using this optional
+        method the filesystem can look up, possibly create and open the file in
+        one atomic operation.  If it cannot perform this (e.g. the file type
+        turned out to be wrong) it may signal this by returning 1 instead of
+        usual 0 or -ve .  This method is only called if the last
+        component is negative or needs lookup.  Cached positive dentries are
+        still handled by f_op->open().
 The Address Space Object
 ========================
@@ -581,6 +592,8 @@ struct address_space_operations {
        int (*migratepage) (struct page *, struct page *);
        int (*launder_page) (struct page *);
        int (*error_remove_page) (struct mapping *mapping, struct page *page);
+        int (*swap_activate)(struct file *);
+        int (*swap_deactivate)(struct file *);
 };
  writepage: called by the VM to write a dirty page to backing store.
@@ -749,6 +762,16 @@ struct address_space_operations {
        Setting this implies you deal with pages going away under you,
        unless you have them locked or reference counts increased.
+  swap_activate: Called when swapon is used on a file to allocate
+        space if necessary and pin the block lookup information in
+        memory. A return value of zero indicates success,
+        in which case this file can be used to back swapspace. The
+        swapspace operations will be proxied to this address space's
+        ->swap_{out,in} methods.
+  swap_deactivate: Called during swapoff on files where swap_activate
+        was successful.
 The File Object
 ===============
@@ -891,7 +914,7 @@ the VFS uses a default. As of kernel 2.6.22, the following members are
 defined:
 struct dentry_operations {
-        int (*d_revalidate)(struct dentry *, struct nameidata *);
+        int (*d_revalidate)(struct dentry *, unsigned int);
        int (*d_hash)(const struct dentry *, const struct inode *,
                        struct qstr *);
        int (*d_compare)(const struct dentry *, const struct inode *,
@@ -910,11 +933,11 @@ struct dentry_operations {
        dcache. Most filesystems leave this as NULL, because all their
        dentries in the dcache are valid
-        d_revalidate may be called in rcu-walk mode (nd->flags & LOOKUP_RCU).
+        d_revalidate may be called in rcu-walk mode (flags & LOOKUP_RCU).
        If in rcu-walk mode, the filesystem must revalidate the dentry without
        blocking or storing to the dentry, d_parent and d_inode should not be
-        used without care (because they can go NULL), instead nd->inode should
+        used without care (because they can change and, in d_inode case, even
-        be used.
+        become NULL under us).
        If a situation is encountered that rcu-walk cannot handle, return
        -ECHILD and it will be called again in ref-walk mode.
diff --git a/Documentation/hid/uhid.txt b/Documentation/hid/uhid.txt
new file mode 100644
index 000000000000..4627c4241ece
--- /dev/null
+++ b/Documentation/hid/uhid.txt
@@ -0,0 +1,169 @@
+      UHID - User-space I/O driver support for HID subsystem
+     ========================================================
+The HID subsystem needs two kinds of drivers. In this document we call them:
+ 1. The "HID I/O Driver" is the driver that performs raw data I/O to the
+    low-level device. Internally, they register an hid_ll_driver structure with
+    the HID core. They perform device setup, read raw data from the device and
+    push it into the HID subsystem and they provide a callback so the HID
+    subsystem can send data to the device.
+ 2. The "HID Device Driver" is the driver that parses HID reports and reacts on
+    them. There are generic drivers like "generic-usb" and "generic-bluetooth"
+    which adhere to the HID specification and provide the standardizes features.
+    But there may be special drivers and quirks for each non-standard device out
+    there. Internally, they use the hid_driver structure.
+Historically, the USB stack was the first subsystem to provide an HID I/O
+Driver. However, other standards like Bluetooth have adopted the HID specs and
+may provide HID I/O Drivers, too. The UHID driver allows to implement HID I/O
+Drivers in user-space and feed the data into the kernel HID-subsystem.
+This allows user-space to operate on the same level as USB-HID, Bluetooth-HID
+and similar. It does not provide a way to write HID Device Drivers, though. Use
+hidraw for this purpose.
+There is an example user-space application in ./samples/uhid/uhid-example.c
+The UHID API
+------------
+UHID is accessed through a character misc-device. The minor-number is allocated
+dynamically so you need to rely on udev (or similar) to create the device node.
+This is /dev/uhid by default.
+If a new device is detected by your HID I/O Driver and you want to register this
+device with the HID subsystem, then you need to open /dev/uhid once for each
+device you want to register. All further communication is done by read()'ing or
+write()'ing "struct uhid_event" objects. Non-blocking operations are supported
+by setting O_NONBLOCK.
+struct uhid_event {
+        __u32 type;
+        union {
+                struct uhid_create_req create;
+                struct uhid_data_req data;
+                ...
+        } u;
+};
+The "type" field contains the ID of the event. Depending on the ID different
+payloads are sent. You must not split a single event across multiple read()'s or
+multiple write()'s. A single event must always be sent as a whole. Furthermore,
+only a single event can be sent per read() or write(). Pending data is ignored.
+If you want to handle multiple events in a single syscall, then use vectored
+I/O with readv()/writev().
+The first thing you should do is sending an UHID_CREATE event. This will
+register the device. UHID will respond with an UHID_START event. You can now
+start sending data to and reading data from UHID. However, unless UHID sends the
+UHID_OPEN event, the internally attached HID Device Driver has no user attached.
+That is, you might put your device asleep unless you receive the UHID_OPEN
+event. If you receive the UHID_OPEN event, you should start I/O. If the last
+user closes the HID device, you will receive an UHID_CLOSE event. This may be
+followed by an UHID_OPEN event again and so on. There is no need to perform
+reference-counting in user-space. That is, you will never receive multiple
+UHID_OPEN events without an UHID_CLOSE event. The HID subsystem performs
+ref-counting for you.
+You may decide to ignore UHID_OPEN/UHID_CLOSE, though. I/O is allowed even
+though the device may have no users.
+If you want to send data to the HID subsystem, you send an HID_INPUT event with
+your raw data payload. If the kernel wants to send data to the device, you will
+read an UHID_OUTPUT or UHID_OUTPUT_EV event.
+If your device disconnects, you should send an UHID_DESTROY event. This will
+unregister the device. You can now send UHID_CREATE again to register a new
+device.
+If you close() the fd, the device is automatically unregistered and destroyed
+internally.
+write()
+-------
+write() allows you to modify the state of the device and feed input data into
+the kernel. The following types are supported: UHID_CREATE, UHID_DESTROY and
+UHID_INPUT. The kernel will parse the event immediately and if the event ID is
+not supported, it will return -EOPNOTSUPP. If the payload is invalid, then
+-EINVAL is returned, otherwise, the amount of data that was read is returned and
+the request was handled successfully.
+  UHID_CREATE:
+  This creates the internal HID device. No I/O is possible until you send this
+  event to the kernel. The payload is of type struct uhid_create_req and
+  contains information about your device. You can start I/O now.
+  UHID_DESTROY:
+  This destroys the internal HID device. No further I/O will be accepted. There
+  may still be pending messages that you can receive with read() but no further
+  UHID_INPUT events can be sent to the kernel.
+  You can create a new device by sending UHID_CREATE again. There is no need to
+  reopen the character device.
+  UHID_INPUT:
+  You must send UHID_CREATE before sending input to the kernel! This event
+  contains a data-payload. This is the raw data that you read from your device.
+  The kernel will parse the HID reports and react on it.
+  UHID_FEATURE_ANSWER:
+  If you receive a UHID_FEATURE request you must answer with this request. You
+  must copy the "id" field from the request into the answer. Set the "err" field
+  to 0 if no error occured or to EIO if an I/O error occurred.
+  If "err" is 0 then you should fill the buffer of the answer with the results
+  of the feature request and set "size" correspondingly.
+read()
+------
+read() will return a queued ouput report. These output reports can be of type
+UHID_START, UHID_STOP, UHID_OPEN, UHID_CLOSE, UHID_OUTPUT or UHID_OUTPUT_EV. No
+reaction is required to any of them but you should handle them according to your
+needs. Only UHID_OUTPUT and UHID_OUTPUT_EV have payloads.
+  UHID_START:
+  This is sent when the HID device is started. Consider this as an answer to
+  UHID_CREATE. This is always the first event that is sent.
+  UHID_STOP:
+  This is sent when the HID device is stopped. Consider this as an answer to
+  UHID_DESTROY.
+  If the kernel HID device driver closes the device manually (that is, you
+  didn't send UHID_DESTROY) then you should consider this device closed and send
+  an UHID_DESTROY event. You may want to reregister your device, though. This is
+  always the last message that is sent to you unless you reopen the device with
+  UHID_CREATE.
+  UHID_OPEN:
+  This is sent when the HID device is opened. That is, the data that the HID
+  device provides is read by some other process. You may ignore this event but
+  it is useful for power-management. As long as you haven't received this event
+  there is actually no other process that reads your data so there is no need to
+  send UHID_INPUT events to the kernel.
+  UHID_CLOSE:
+  This is sent when there are no more processes which read the HID data. It is
+  the counterpart of UHID_OPEN and you may as well ignore this event.
+  UHID_OUTPUT:
+  This is sent if the HID device driver wants to send raw data to the I/O
+  device. You should read the payload and forward it to the device. The payload
+  is of type "struct uhid_data_req".
+  This may be received even though you haven't received UHID_OPEN, yet.
+  UHID_OUTPUT_EV:
+  Same as UHID_OUTPUT but this contains a "struct input_event" as payload. This
+  is called for force-feedback, LED or similar events which are received through
+  an input device by the HID subsystem. You should convert this into raw reports
+  and send them to your device similar to events of type UHID_OUTPUT.
+  UHID_FEATURE:
+  This event is sent if the kernel driver wants to perform a feature request as
+  described in the HID specs. The report-type and report-number are available in
+  the payload.
+  The kernel serializes feature requests so there will never be two in parallel.
+  However, if you fail to respond with a UHID_FEATURE_ANSWER in a time-span of 5
+  seconds, then the requests will be dropped and a new one might be sent.
+  Therefore, the payload also contains an "id" field that identifies every
+  request.
+Document by:
+  David Herrmann <dh.herrmann@googlemail.com>
diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052
new file mode 100644
index 000000000000..ef898553638e
--- /dev/null
+++ b/Documentation/hwmon/da9052
@@ -0,0 +1,61 @@
+Supported chips:
+  * Dialog Semiconductors DA9052-BC and DA9053-AA/Bx PMICs
+    Prefix: 'da9052'
+    Datasheet: Datasheet is not publicly available.
+Authors: David Dajun Chen <dchen@diasemi.com>
+Description
+-----------
+The DA9052/53 provides an Analogue to Digital Converter (ADC) with 10 bits
+resolution and track and hold circuitry combined with an analogue input
+multiplexer. The analogue input multiplexer will allow conversion of up to 10
+different inputs. The track and hold circuit ensures stable input voltages at
+the input of the ADC during the conversion.
+The ADC is used to measure the following inputs:
+Channel 0: VDDOUT - measurement of the system voltage
+Channel 1: ICH - internal battery charger current measurement
+Channel 2: TBAT - output from the battery NTC
+Channel 3: VBAT - measurement of the battery voltage
+Channel 4: ADC_IN4 - high impedance input (0 - 2.5V)
+Channel 5: ADC_IN5 - high impedance input (0 - 2.5V)
+Channel 6: ADC_IN6 - high impedance input (0 - 2.5V)
+Channel 7: XY - TSI interface to measure the X and Y voltage of the touch
+           screen resistive potentiometers
+Channel 8: Internal Tjunc. - sense (internal temp. sensor)
+Channel 9: VBBAT - measurement of the backup battery voltage
+By using sysfs attributes we can measure the system voltage VDDOUT, the battery
+charging current ICH, battery temperature TBAT, battery junction temperature
+TJUNC, battery voltage VBAT and the back up battery voltage VBBAT.
+Voltage Monitoring
+------------------
+Voltages are sampled by a 10 bit ADC.
+The battery voltage is calculated as:
+        Milli volt = ((ADC value * 1000) / 512) + 2500
+The backup battery voltage is calculated as:
+        Milli volt = (ADC value * 2500) / 512;
+The voltages on ADC channels 4, 5 and 6 are calculated as:
+        Milli volt = (ADC value * 2500) / 1023
+Temperature Monitoring
+----------------------
+Temperatures are sampled by a 10 bit ADC.  Junction and battery temperatures
+are monitored by the ADC channels.
+The junction temperature is calculated:
+        Degrees celsius = 1.708 * (TJUNC_RES - T_OFFSET) - 108.8
+The junction temperature attribute is supported by the driver.
+The battery temperature is calculated:
+        Degree Celcius = 1 / (t1 + 1/298)- 273
+where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255))
+Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively.
diff --git a/Documentation/hwmon/hih6130 b/Documentation/hwmon/hih6130
new file mode 100644
index 000000000000..73dae918ea7b
--- /dev/null
+++ b/Documentation/hwmon/hih6130
@@ -0,0 +1,37 @@
+Kernel driver hih6130
+=====================
+Supported chips:
+  * Honeywell HIH-6130 / HIH-6131
+    Prefix: 'hih6130'
+    Addresses scanned: none
+    Datasheet: Publicly available at the Honeywell website
+    http://sensing.honeywell.com/index.php?ci_id=3106&la_id=1&defId=44872
+Author:
+  Iain Paton <ipaton0@gmail.com>
+Description
+-----------
+The HIH-6130 & HIH-6131 are humidity and temperature sensors in a SO8 package.
+The difference between the two devices is that the HIH-6131 has a condensation
+filter.
+The devices communicate with the I2C protocol. All sensors are set to the same
+I2C address 0x27 by default, so an entry with I2C_BOARD_INFO("hih6130", 0x27)
+can be used in the board setup code.
+Please see Documentation/i2c/instantiating-devices for details on how to
+instantiate I2C devices.
+sysfs-Interface
+---------------
+temp1_input - temperature input
+humidity1_input - humidity input
+Notes
+-----
+Command mode and alarms are not currently supported.
diff --git a/Documentation/hwmon/submitting-patches b/Documentation/hwmon/submitting-patches
index 86f42e8e9e49..790f774a3032 100644
--- a/Documentation/hwmon/submitting-patches
+++ b/Documentation/hwmon/submitting-patches
@@ -70,6 +70,9 @@ increase the chances of your change being accepted.
  review more difficult. It may also result in code which is more complicated
  than necessary. Use inline functions or just regular functions instead.
+* Use devres functions whenever possible to allocate resources. For rationale
+  and supported functions, please see Documentation/driver-model/devres.txt.
 * If the driver has a detect function, make sure it is silent. Debug messages
  and messages printed after a successful detection are acceptable, but it
  must not print messages such as "Chip XXX not found/supported".
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index 71f55bbcefc8..615142da4ef6 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -38,9 +38,10 @@ Module Parameters
 Disable selected features normally supported by the device. This makes it
 possible to work around possible driver or hardware bugs if the feature in
 question doesn't work as intended for whatever reason. Bit values:
-  1  disable SMBus PEC
+ 0x01  disable SMBus PEC
-  2  disable the block buffer
+ 0x02  disable the block buffer
-  8  disable the I2C block read functionality
+ 0x08  disable the I2C block read functionality
+ 0x10  don't use interrupts
 Description
@@ -86,6 +87,12 @@ SMBus 2.0 Support
 The 82801DB (ICH4) and later chips support several SMBus 2.0 features.
+Interrupt Support
+-----------------
+PCI interrupt support is supported on the 82801EB (ICH5) and later chips.
 Hidden ICH SMBus
 ----------------
diff --git a/Documentation/i2c/busses/i2c-piix4 b/Documentation/i2c/busses/i2c-piix4
index 475bb4ae0720..1e6634f54c50 100644
--- a/Documentation/i2c/busses/i2c-piix4
+++ b/Documentation/i2c/busses/i2c-piix4
@@ -8,6 +8,11 @@ Supported adapters:
    Datasheet: Only available via NDA from ServerWorks
  * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
    Datasheet: Not publicly available
+    SB700 register reference available at:
+    http://support.amd.com/us/Embedded_TechDocs/43009_sb7xx_rrg_pub_1.00.pdf
+  * AMD SP5100 (SB700 derivative found on some server mainboards)
+    Datasheet: Publicly available at the AMD website
+    http://support.amd.com/us/Embedded_TechDocs/44413.pdf
  * AMD Hudson-2
    Datasheet: Not publicly available
  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
@@ -68,6 +73,10 @@ this driver on those mainboards.
 The ServerWorks Southbridges, the Intel 440MX, and the Victory66 are
 identical to the PIIX4 in I2C/SMBus support.
+The AMD SB700 and SP5100 chipsets implement two PIIX4-compatible SMBus
+controllers. If your BIOS initializes the secondary controller, it will
+be detected by this driver as an "Auxiliary SMBus Host Controller".
 If you own Force CPCI735 motherboard or other OSB4 based systems you may need
 to change the SMBus Interrupt Select register so the SMBus controller uses
 the SMI mode.
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index 5aa53374ea2a..3a94b0e6f601 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -245,21 +245,17 @@ static int __init foo_init(void)
 {
        return i2c_add_driver(&foo_driver);
 }
+module_init(foo_init);
 static void __exit foo_cleanup(void)
 {
        i2c_del_driver(&foo_driver);
 }
+module_exit(foo_cleanup);
-/* Substitute your own name and email address */
+The module_i2c_driver() macro can be used to reduce above code.
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"
-MODULE_DESCRIPTION("Driver for Barf Inc. Foo I2C devices");
-/* a few non-GPL license types are also allowed */
-MODULE_LICENSE("GPL");
-module_init(foo_init);
+module_i2c_driver(foo_driver);
-module_exit(foo_cleanup);
 Note that some functions are marked by `__init'.  These functions can
 be removed after kernel booting (or module loading) is completed.
@@ -267,6 +263,17 @@ Likewise, functions marked by `__exit' are dropped by the compiler when
 the code is built into the kernel, as they would never be called.
+Driver Information
+==================
+/* Substitute your own name and email address */
+MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>"
+MODULE_DESCRIPTION("Driver for Barf Inc. Foo I2C devices");
+/* a few non-GPL license types are also allowed */
+MODULE_LICENSE("GPL");
 Power Management
 ================
diff --git a/Documentation/input/edt-ft5x06.txt b/Documentation/input/edt-ft5x06.txt
new file mode 100644
index 000000000000..2032f0b7a8fa
--- /dev/null
+++ b/Documentation/input/edt-ft5x06.txt
@@ -0,0 +1,54 @@
+EDT ft5x06 based Polytouch devices
+----------------------------------
+The edt-ft5x06 driver is useful for the EDT "Polytouch" family of capacitive
+touch screens. Note that it is *not* suitable for other devices based on the
+focaltec ft5x06 devices, since they contain vendor-specific firmware. In
+particular this driver is not suitable for the Nook tablet.
+It has been tested with the following devices:
+  * EP0350M06
+  * EP0430M06
+  * EP0570M06
+  * EP0700M06
+The driver allows configuration of the touch screen via a set of sysfs files:
+/sys/class/input/eventX/device/device/threshold:
+    allows setting the "click"-threshold in the range from 20 to 80.
+/sys/class/input/eventX/device/device/gain:
+    allows setting the sensitivity in the range from 0 to 31. Note that
+    lower values indicate higher sensitivity.
+/sys/class/input/eventX/device/device/offset:
+    allows setting the edge compensation in the range from 0 to 31.
+/sys/class/input/eventX/device/device/report_rate:
+    allows setting the report rate in the range from 3 to 14.
+For debugging purposes the driver provides a few files in the debug
+filesystem (if available in the kernel). In /sys/kernel/debug/edt_ft5x06
+you'll find the following files:
+num_x, num_y:
+    (readonly) contains the number of sensor fields in X- and
+    Y-direction.
+mode:
+    allows switching the sensor between "factory mode" and "operation
+    mode" by writing "1" or "0" to it. In factory mode (1) it is
+    possible to get the raw data from the sensor. Note that in factory
+    mode regular events don't get delivered and the options described
+    above are unavailable.
+raw_data:
+    contains num_x * num_y big endian 16 bit values describing the raw
+    values for each sensor field. Note that each read() call on this
+    files triggers a new readout. It is recommended to provide a buffer
+    big enough to contain num_x * num_y * 2 bytes.
+Note that reading raw_data gives a I/O error when the device is not in factory
+mode. The same happens when reading/writing to the parameter files when the
+device is not in regular operation mode.
diff --git a/Documentation/input/multi-touch-protocol.txt b/Documentation/input/multi-touch-protocol.txt
index 543101c5bf26..2c179613f81b 100644
--- a/Documentation/input/multi-touch-protocol.txt
+++ b/Documentation/input/multi-touch-protocol.txt
@@ -162,26 +162,48 @@ 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 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 contact, respectively.
+of the contact area and approaching tool, respectively.
 The TOUCH and WIDTH parameters have a geometrical interpretation; imagine
 looking through a window at someone gently holding a finger against the
 glass.  You will see two regions, one inner region consisting of the part
 of the finger actually touching the glass, and one outer region formed by
-the perimeter of the finger. The diameter of the inner region is the
+the perimeter of the finger. The center of the touching region (a) is
-ABS_MT_TOUCH_MAJOR, the diameter of the outer region is
+ABS_MT_POSITION_X/Y and the center of the approaching finger (b) is
-ABS_MT_WIDTH_MAJOR. Now imagine the person pressing the finger harder
+ABS_MT_TOOL_X/Y. The touch diameter is ABS_MT_TOUCH_MAJOR and the finger
-against the glass. The inner region will increase, and in general, the
+diameter is ABS_MT_WIDTH_MAJOR. Now imagine the person pressing the finger
-ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR, which is always smaller than
+harder against the glass. The touch region will increase, and in general,
-unity, is related to the contact pressure. For pressure-based devices,
+the ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR, which is always smaller
+than 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. Devices capable of contact hovering can use ABS_MT_DISTANCE to
 indicate the distance between the contact and the surface.
-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
+          Linux MT                               Win8
-major and minor axis of an ellipse. Finally, the orientation of the oval
+         __________                     _______________________
-shape can be describe with the ORIENTATION parameter.
+        /          \                   |                       |
+       /            \                  |                       |
+      /     ____     \                 |                       |
+     /     /    \     \                |                       |
+     \     \  a  \     \               |       a               |
+      \     \____/      \              |                       |
+       \                 \             |                       |
+        \        b        \            |           b           |
+         \                 \           |                       |
+          \                 \          |                       |
+           \                 \         |                       |
+            \                /         |                       |
+             \              /          |                       |
+              \            /           |                       |
+               \__________/            |_______________________|
+In addition to the MAJOR parameters, the oval shape of the touch and finger
+regions can be described by adding the MINOR parameters, such that MAJOR
+and MINOR are the major and minor axis of an ellipse. The orientation of
+the touch ellipse can be described with the ORIENTATION parameter, and the
+direction of the finger ellipse is given by the vector (a - b).
 For type A devices, further specification of the touch shape is possible
 via ABS_MT_BLOB_ID.
@@ -224,7 +246,7 @@ tool. Omit if circular [4].
 The above four values can be used to derive additional information about
 the contact. The ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR approximates
 the notion of pressure. The fingers of the hand and the palm all have
-different characteristic widths [1].
+different characteristic widths.
 ABS_MT_PRESSURE
@@ -240,17 +262,24 @@ the contact is hovering above the surface.
 ABS_MT_ORIENTATION
-The orientation of the ellipse. The value should describe a signed quarter
+The orientation of the touching ellipse. The value should describe a signed
-of a revolution clockwise around the touch center. The signed value range
+quarter of a revolution clockwise around the touch center. The signed value
-is arbitrary, but zero should be returned for a finger aligned along the Y
+range is arbitrary, but zero should be returned for an ellipse aligned with
-axis of the surface, a negative value when finger is turned to the left, and
+the Y axis of the surface, a negative value when the ellipse is turned to
-a positive value when finger turned to the right. When completely aligned with
+the left, and a positive value when the ellipse is turned to the
-the X axis, the range max should be returned.  Orientation can be omitted
+right. When completely aligned with the X axis, the range max should be
-if the touching object is circular, or if the information is not available
+returned.
-in the kernel driver. Partial orientation support is possible if the device
-can distinguish between the two axis, but not (uniquely) any values in
+Touch ellipsis are symmetrical by default. For devices capable of true 360
-between. In such cases, the range of ABS_MT_ORIENTATION should be [0, 1]
+degree orientation, the reported orientation must exceed the range max to
-[4].
+indicate more than a quarter of a revolution. For an upside-down finger,
+range max * 2 should be returned.
+Orientation can be omitted if the touch area is circular, or if the
+information is not available in the kernel driver. Partial orientation
+support is possible if the device can distinguish between the two axis, but
+not (uniquely) any values in between. In such cases, the range of
+ABS_MT_ORIENTATION should be [0, 1] [4].
 ABS_MT_POSITION_X
@@ -260,6 +289,23 @@ ABS_MT_POSITION_Y
 The surface Y coordinate of the center of the touching ellipse.
+ABS_MT_TOOL_X
+The surface X coordinate of the center of the approaching tool. Omit if
+the device cannot distinguish between the intended touch point and the
+tool itself.
+ABS_MT_TOOL_Y
+The surface Y coordinate of the center of the approaching tool. Omit if the
+device cannot distinguish between the intended touch point and the tool
+itself.
+The four position values can be used to separate the position of the touch
+from the position of the tool. If both positions are present, the major
+tool axis points towards the touch point [1]. Otherwise, the tool axes are
+aligned with the touch axes.
 ABS_MT_TOOL_TYPE
 The type of approaching tool. A lot of kernel drivers cannot distinguish
@@ -305,6 +351,28 @@ The range of ABS_MT_ORIENTATION should be set to [0, 1], to indicate that
 the device can distinguish between a finger along the Y axis (0) and a
 finger along the X axis (1).
+For win8 devices with both T and C coordinates, the position mapping is
+   ABS_MT_POSITION_X := T_X
+   ABS_MT_POSITION_Y := T_Y
+   ABS_MT_TOOL_X := C_X
+   ABS_MT_TOOL_X := C_Y
+Unfortunately, there is not enough information to specify both the touching
+ellipse and the tool ellipse, so one has to resort to approximations.  One
+simple scheme, which is compatible with earlier usage, is:
+   ABS_MT_TOUCH_MAJOR := min(X, Y)
+   ABS_MT_TOUCH_MINOR := <not used>
+   ABS_MT_ORIENTATION := <not used>
+   ABS_MT_WIDTH_MAJOR := min(X, Y) + distance(T, C)
+   ABS_MT_WIDTH_MINOR := min(X, Y)
+Rationale: We have no information about the orientation of the touching
+ellipse, so approximate it with an inscribed circle instead. The tool
+ellipse should align with the the vector (T - C), so the diameter must
+increase with distance(T, C). Finally, assume that the touch diameter is
+equal to the tool thickness, and we arrive at the formulas above.
 Finger Tracking
 ---------------
@@ -338,9 +406,7 @@ subsequent events of the same type refer to different fingers.
 For example usage of the type A protocol, see the bcm5974 driver. For
 example usage of the type B protocol, see the hid-egalax driver.
-[1] With the extension ABS_MT_APPROACH_X and ABS_MT_APPROACH_Y, the
+[1] Also, the difference (TOOL_X - POSITION_X) can be used to model tilt.
-difference between the contact position and the approaching tool position
-could be used to derive tilt.
 [2] The list can of course be extended.
 [3] The mtdev project: http://bitmath.org/code/mtdev/.
 [4] See the section on event computation.
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 915f28c470e9..849b771c5e03 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -88,6 +88,7 @@ Code  Seq#(hex)	Include File		Comments
                and kernel/power/user.c
 '8'     all                             SNP8023 advanced NIC card
                                        <mailto:mcr@solidum.com>
+';'     64-7F   linux/vfio.h
 '@'     00-0F   linux/radeonfb.h        conflict!
 '@'     00-0F   drivers/video/aty/aty128fb.c    conflict!
 'A'     00-1F   linux/apm_bios.h        conflict!
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 506c7390c2b9..13f1aa09b938 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -86,7 +86,7 @@ There is also a gitweb interface available at
 http://www.kernel.org/git/?p=utils/kernel/kexec/kexec-tools.git
 More information about kexec-tools can be found at
-http://www.kernel.org/pub/linux/utils/kernel/kexec/README.html
+http://horms.net/projects/kexec/
 3) Unpack the tarball with the tar command, as follows:
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index a92c5ebf373e..ad7e2e5088c1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -526,7 +526,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        coherent_pool=nn[KMG]   [ARM,KNL]
                        Sets the size of memory pool for coherent, atomic dma
-                        allocations if Contiguous Memory Allocator (CMA) is used.
+                        allocations, by default set to 256K.
        code_bytes      [X86] How many bytes of object code to print
                        in an oops report.
@@ -1134,7 +1134,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                forcesac
                soft
                pt              [x86, IA-64]
-                group_mf        [x86, IA-64]
        io7=            [HW] IO7 for Marvel based alpha systems
@@ -2367,6 +2366,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Set maximum number of finished RCU callbacks to process
                        in one batch.
+        rcutree.fanout_leaf=    [KNL,BOOT]
+                        Increase the number of CPUs assigned to each
+                        leaf rcu_node structure.  Useful for very large
+                        systems.
        rcutree.qhimark=        [KNL,BOOT]
                        Set threshold of queued
                        RCU callbacks over which batch limiting is disabled.
@@ -2932,6 +2936,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                        initial READ(10) command);
                                o = CAPACITY_OK (accept the capacity
                                        reported by the device);
+                                p = WRITE_CACHE (the device cache is ON
+                                        by default);
                                r = IGNORE_RESIDUE (the device reports
                                        bogus residue values);
                                s = SINGLE_LUN (the device has only one
diff --git a/Documentation/laptops/asus-laptop.txt b/Documentation/laptops/asus-laptop.txt
index a1e04d679289..69f9fb3701e0 100644
--- a/Documentation/laptops/asus-laptop.txt
+++ b/Documentation/laptops/asus-laptop.txt
@@ -151,8 +151,7 @@ Display switching
  Debugging:
  1) Check whether the Fn+F8 key:
-     a) does not lock the laptop (try disabling CONFIG_X86_UP_APIC or boot with
+     a) does not lock the laptop (try a boot with noapic / nolapic if it does)
-        noapic / nolapic if it does)
     b) generates events (0x6n, where n is the value corresponding to the
        configuration above)
     c) actually works
diff --git a/Documentation/leds/00-INDEX b/Documentation/leds/00-INDEX
index 29f481df32c7..5fefe374892f 100644
--- a/Documentation/leds/00-INDEX
+++ b/Documentation/leds/00-INDEX
@@ -6,3 +6,5 @@ leds-lp5521.txt
        - notes on how to use the leds-lp5521 driver.
 leds-lp5523.txt
        - notes on how to use the leds-lp5523 driver.
+leds-lm3556.txt
+        - notes on how to use the leds-lm3556 driver.
diff --git a/Documentation/leds/leds-blinkm.txt b/Documentation/leds/leds-blinkm.txt
new file mode 100644
index 000000000000..9dd92f4cf4e1
--- /dev/null
+++ b/Documentation/leds/leds-blinkm.txt
@@ -0,0 +1,80 @@
+The leds-blinkm driver supports the devices of the BlinkM family.
+They are RGB-LED modules driven by a (AT)tiny microcontroller and
+communicate through I2C. The default address of these modules is
+0x09 but this can be changed through a command. By this you could
+dasy-chain up to 127 BlinkMs on an I2C bus.
+The device accepts RGB and HSB color values through separate commands.
+Also you can store blinking sequences as "scripts" in
+the controller and run them. Also fading is an option.
+The interface this driver provides is 2-fold:
+a) LED class interface for use with triggers
+############################################
+The registration follows the scheme:
+blinkm-<i2c-bus-nr>-<i2c-device-nr>-<color>
+$ ls -h /sys/class/leds/blinkm-6-*
+/sys/class/leds/blinkm-6-9-blue:
+brightness  device  max_brightness  power  subsystem  trigger  uevent
+/sys/class/leds/blinkm-6-9-green:
+brightness  device  max_brightness  power  subsystem  trigger  uevent
+/sys/class/leds/blinkm-6-9-red:
+brightness  device  max_brightness  power  subsystem  trigger  uevent
+(same is /sys/bus/i2c/devices/6-0009/leds)
+We can control the colors separated into red, green and blue and
+assign triggers on each color.
+E.g.:
+$ cat blinkm-6-9-blue/brightness
+05
+$ echo 200 > blinkm-6-9-blue/brightness
+$
+$ modprobe ledtrig-heartbeat
+$ echo heartbeat > blinkm-6-9-green/trigger
+$
+b) Sysfs group to control rgb, fade, hsb, scripts ...
+#####################################################
+This extended interface is available as folder blinkm
+in the sysfs folder of the I2C device.
+E.g. below /sys/bus/i2c/devices/6-0009/blinkm
+$ ls -h /sys/bus/i2c/devices/6-0009/blinkm/
+blue  green  red  test
+Currently supported is just setting red, green, blue
+and a test sequence.
+E.g.:
+$ cat *
+00
+00
+00
+#Write into test to start test sequence!#
+$ echo 1 > test
+$
+$ echo 255 > red
+$
+as of 6/2012
+dl9pf <at> gmx <dot> de
diff --git a/Documentation/leds/leds-lm3556.txt b/Documentation/leds/leds-lm3556.txt
new file mode 100644
index 000000000000..d9eb91b51913
--- /dev/null
+++ b/Documentation/leds/leds-lm3556.txt
@@ -0,0 +1,85 @@
+Kernel driver for lm3556
+========================
+*Texas Instrument:
+ 1.5 A Synchronous Boost LED Flash Driver w/ High-Side Current Source
+* Datasheet: http://www.national.com/ds/LM/LM3556.pdf
+Authors:
+        Daniel Jeong
+        Contact:Daniel Jeong(daniel.jeong-at-ti.com, gshark.jeong-at-gmail.com)
+Description
+-----------
+There are 3 functions in LM3556, Flash, Torch and Indicator.
+FLASH MODE
+In Flash Mode, the LED current source(LED) provides 16 target current levels
+from 93.75 mA to 1500 mA.The Flash currents are adjusted via the CURRENT
+CONTROL REGISTER(0x09).Flash mode is activated by the ENABLE REGISTER(0x0A),
+or by pulling the STROBE pin HIGH.
+LM3556 Flash can be controlled through sys/class/leds/flash/brightness file
+* if STROBE pin is enabled, below example control brightness only, and
+ON / OFF will be controlled by STROBE pin.
+Flash Example:
+OFF     : #echo 0 > sys/class/leds/flash/brightness
+93.75 mA: #echo 1 > sys/class/leds/flash/brightness
+... .....
+1500  mA: #echo 16 > sys/class/leds/flash/brightness
+TORCH MODE
+In Torch Mode, the current source(LED) is programmed via the CURRENT CONTROL
+REGISTER(0x09).Torch Mode is activated by the ENABLE REGISTER(0x0A) or by the
+hardware TORCH input.
+LM3556 torch can be controlled through sys/class/leds/torch/brightness file.
+* if TORCH pin is enabled, below example control brightness only,
+and ON / OFF will be controlled by TORCH pin.
+Torch Example:
+OFF     : #echo 0 > sys/class/leds/torch/brightness
+46.88 mA: #echo 1 > sys/class/leds/torch/brightness
+... .....
+375 mA  : #echo 8 > sys/class/leds/torch/brightness
+INDICATOR MODE
+Indicator pattern can be set through sys/class/leds/indicator/pattern file,
+and 4 patterns are pre-defined in indicator_pattern array.
+According to N-lank, Pulse time and N Period values, different pattern wiill
+be generated.If you want new patterns for your own device, change
+indicator_pattern array with your own values and INDIC_PATTERN_SIZE.
+Please refer datasheet for more detail about N-Blank, Pulse time and N Period.
+Indicator pattern example:
+pattern 0: #echo 0 > sys/class/leds/indicator/pattern
+....
+pattern 3: #echo 3 > sys/class/leds/indicator/pattern
+Indicator brightness can be controlled through
+sys/class/leds/indicator/brightness file.
+Example:
+OFF      : #echo 0 > sys/class/leds/indicator/brightness
+5.86 mA  : #echo 1 > sys/class/leds/indicator/brightness
+........
+46.875mA : #echo 8 > sys/class/leds/indicator/brightness
+Notes
+-----
+Driver expects it is registered using the i2c_board_info mechanism.
+To register the chip at address 0x63 on specific adapter, set the platform data
+according to include/linux/platform_data/leds-lm3556.h, set the i2c board info
+Example:
+        static struct i2c_board_info __initdata board_i2c_ch4[] = {
+                {
+                         I2C_BOARD_INFO(LM3556_NAME, 0x63),
+                         .platform_data = &lm3556_pdata,
+                 },
+        };
+and register it in the platform init function
+Example:
+        board_register_i2c_bus(4, 400,
+                                board_i2c_ch4, ARRAY_SIZE(board_i2c_ch4));
diff --git a/Documentation/leds/ledtrig-oneshot.txt b/Documentation/leds/ledtrig-oneshot.txt
new file mode 100644
index 000000000000..07cd1fa41a3a
--- /dev/null
+++ b/Documentation/leds/ledtrig-oneshot.txt
@@ -0,0 +1,59 @@
+One-shot LED Trigger
+====================
+This is a LED trigger useful for signaling the user of an event where there are
+no clear trap points to put standard led-on and led-off settings.  Using this
+trigger, the application needs only to signal the trigger when an event has
+happened, than the trigger turns the LED on and than keeps it off for a
+specified amount of time.
+This trigger is meant to be usable both for sporadic and dense events.  In the
+first case, the trigger produces a clear single controlled blink for each
+event, while in the latter it keeps blinking at constant rate, as to signal
+that the events are arriving continuously.
+A one-shot LED only stays in a constant state when there are no events.  An
+additional "invert" property specifies if the LED has to stay off (normal) or
+on (inverted) when not rearmed.
+The trigger can be activated from user space on led class devices as shown
+below:
+  echo oneshot > trigger
+This adds the following sysfs attributes to the LED:
+  delay_on - specifies for how many milliseconds the LED has to stay at
+             LED_FULL brightness after it has been armed.
+             Default to 100 ms.
+  delay_off - specifies for how many milliseconds the LED has to stay at
+              LED_OFF brightness after it has been armed.
+              Default to 100 ms.
+  invert - reverse the blink logic.  If set to 0 (default) blink on for delay_on
+           ms, then blink off for delay_off ms, leaving the LED normally off.  If
+           set to 1, blink off for delay_off ms, then blink on for delay_on ms,
+           leaving the LED normally on.
+           Setting this value also immediately change the LED state.
+  shot - write any non-empty string to signal an events, this starts a blink
+         sequence if not already running.
+Example use-case: network devices, initialization:
+  echo oneshot > trigger # set trigger for this led
+  echo 33 > delay_on     # blink at 1 / (33 + 33) Hz on continuous traffic
+  echo 33 > delay_off
+interface goes up:
+  echo 1 > invert # set led as normally-on, turn the led on
+packet received/transmitted:
+  echo 1 > shot # led starts blinking, ignored if already blinking
+interface goes down
+  echo 0 > invert # set led as normally-off, turn the led off
diff --git a/Documentation/misc-devices/mei/mei.txt b/Documentation/misc-devices/mei/mei.txt
index 2785697da59d..6ec702950719 100644
--- a/Documentation/misc-devices/mei/mei.txt
+++ b/Documentation/misc-devices/mei/mei.txt
@@ -50,25 +50,25 @@ Intel MEI Driver
 The driver exposes a misc device called /dev/mei.
 An application maintains communication with an Intel ME feature while
-/dev/mei is open. The binding to a specific features is performed by calling
+/dev/mei is open. The binding to a specific feature is performed by calling
 MEI_CONNECT_CLIENT_IOCTL, which passes the desired UUID.
 The number of instances of an Intel ME feature that can be opened
 at the same time depends on the Intel ME feature, but most of the
 features allow only a single instance.
 The Intel AMT Host Interface (Intel AMTHI) feature supports multiple
-simultaneous user applications. Therefore, the Intel MEI driver handles
+simultaneous user connected applications. The Intel MEI driver
-this internally by maintaining request queues for the applications.
+handles this internally by maintaining request queues for the applications.
-The driver is oblivious to data that is passed between firmware feature
+The driver is transparent to data that are passed between firmware feature
 and host application.
 Because some of the Intel ME features can change the system
 configuration, the driver by default allows only a privileged
 user to access it.
-A code snippet for an application communicating with
+A code snippet for an application communicating with Intel AMTHI client:
-Intel AMTHI client:
        struct mei_connect_client_data data;
        fd = open(MEI_DEVICE);
@@ -185,7 +185,7 @@ The Intel AMT Watchdog is composed of two parts:
        2) Intel MEI driver - connects to the watchdog feature, configures the
           watchdog and sends the heartbeats.
-The Intel MEI driver uses the kernel watchdog to configure the Intel AMT
+The Intel MEI driver uses the kernel watchdog API to configure the Intel AMT
 Watchdog and to send heartbeats to it. The default timeout of the
 watchdog is 120 seconds.
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 75a592365af9..8f3ae4a6147e 100644
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -211,6 +211,11 @@ The debug output can be changed at runtime  using  the  file
 will enable debug messages for when routes change.
+Counters for different types of packets entering and leaving the
+batman-adv module are available through ethtool:
+# ethtool --statistics bat0
 BATCTL
 ------
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index bfea8a338901..6b1c7110534e 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1210,7 +1210,7 @@ options, you may wish to use the "max_bonds" module parameter,
 documented above.
        To create multiple bonding devices with differing options, it is
-preferrable to use bonding parameters exported by sysfs, documented in the
+preferable to use bonding parameters exported by sysfs, documented in the
 section below.
        For versions of bonding without sysfs support, the only means to
@@ -1950,7 +1950,7 @@ access to fail over to.  Additionally, the bonding load balance modes
 support link monitoring of their members, so if individual links fail,
 the load will be rebalanced across the remaining devices.
-        See Section 13, "Configuring Bonding for Maximum Throughput"
+        See Section 12, "Configuring Bonding for Maximum Throughput"
 for information on configuring bonding with one peer device.
 11.2 High Availability in a Multiple Switch Topology
@@ -2620,7 +2620,7 @@ be found at:
 https://lists.sourceforge.net/lists/listinfo/bonding-devel
-        Discussions regarding the developpement of the bonding driver take place
+        Discussions regarding the development of the bonding driver take place
 on the main Linux network mailing list, hosted at vger.kernel.org. The list
 address is:
diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.txt
index a7ba5e4e2c91..a27cb6214ed7 100644
--- a/Documentation/networking/bridge.txt
+++ b/Documentation/networking/bridge.txt
@@ -1,7 +1,14 @@
 In order to use the Ethernet bridging functionality, you'll need the
-userspace tools. These programs and documentation are available
+userspace tools.
-at http://www.linuxfoundation.org/en/Net:Bridge.  The download page is
-http://prdownloads.sourceforge.net/bridge.
+Documentation for Linux bridging is on:
+   http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+The bridge-utilities are maintained at:
+   git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git
+Additionally, the iproute2 utilities can be used to configure
+bridge devices.
 If you still have questions, don't hesitate to post to the mailing list 
 (more info https://lists.linux-foundation.org/mailman/listinfo/bridge).
diff --git a/Documentation/networking/caif/Linux-CAIF.txt b/Documentation/networking/caif/Linux-CAIF.txt
index e52fd62bef3a..0aa4bd381bec 100644
--- a/Documentation/networking/caif/Linux-CAIF.txt
+++ b/Documentation/networking/caif/Linux-CAIF.txt
@@ -19,60 +19,36 @@ and host. Currently, UART and Loopback are available for Linux.
 Architecture:
 ------------
 The implementation of CAIF is divided into:
-* CAIF Socket Layer, Kernel API, and  Net Device.
+* CAIF Socket Layer and GPRS IP Interface.
 * CAIF Core Protocol Implementation
 * CAIF Link Layer, implemented as NET devices.
  RTNL
   !
-   !     +------+   +------+   +------+
+   !          +------+   +------+
-   !    +------+!  +------+!  +------+!
+   !         +------+!  +------+!
-   !    ! Sock !!  !Kernel!!  ! Net  !!
+   !         !  IP  !!  !Socket!!
-   !    ! API  !+  ! API  !+  ! Dev  !+   <- CAIF Client APIs
+   +-------> !interf!+  ! API  !+       <- CAIF Client APIs
-   !    +------+   +------!   +------+
+   !         +------+   +------!
-   !       !          !          !
+   !            !           !
-   !       +----------!----------+
+   !            +-----------+
-   !               +------+               <- CAIF Protocol Implementation
+   !                  !
-   +------->       ! CAIF !
+   !               +------+             <- CAIF Core Protocol
-                   ! Core !
+   !               ! CAIF !
-                   +------+
+   !               ! Core !
-             +--------!--------+
+   !               +------+
-             !                 !
+   !       +----------!---------+
-          +------+          +-----+
+   !       !          !         !
-          !      !          ! TTY !       <- Link Layer (Net Devices)
+   !    +------+   +-----+   +------+
-          +------+          +-----+
+   +--> ! HSI  !   ! TTY !   ! USB  !   <- Link Layer (Net Devices)
+        +------+   +-----+   +------+
-Using the Kernel API
----------------------
-The Kernel API is used for accessing CAIF channels from the
-kernel.
-The user of the API has to implement two callbacks for receive
-and control.
-The receive callback gives a CAIF packet as a SKB. The control
-callback will
-notify of channel initialization complete, and flow-on/flow-
-off.
-  struct caif_device caif_dev = {
-    .caif_config = {
-     .name = "MYDEV"
-     .type = CAIF_CHTY_AT
-    }
-   .receive_cb = my_receive,
-   .control_cb = my_control,
-  };
-  caif_add_device(&caif_dev);
-  caif_transmit(&caif_dev, skb);
-See the caif_kernel.h for details about the CAIF kernel API.
 I M P L E M E N T A T I O N
 ===========================
-===========================
 CAIF Core Protocol Layer
 =========================================
@@ -88,17 +64,13 @@ The Core CAIF implementation contains:
      - Simple implementation of CAIF.
      - Layered architecture (a la Streams), each layer in the CAIF
        specification is implemented in a separate c-file.
-      - Clients must implement PHY layer to access physical HW
-        with receive and transmit functions.
      - Clients must call configuration function to add PHY layer.
      - Clients must implement CAIF layer to consume/produce
        CAIF payload with receive and transmit functions.
      - Clients must call configuration function to add and connect the
        Client layer.
      - When receiving / transmitting CAIF Packets (cfpkt), ownership is passed
-        to the called function (except for framing layers' receive functions
+        to the called function (except for framing layers' receive function)
-        or if a transmit function returns an error, in which case the caller
-        must free the packet).
 Layered Architecture
 --------------------
@@ -109,11 +81,6 @@ Implementation. The support functions include:
        CAIF Packet has functions for creating, destroying and adding content
        and for adding/extracting header and trailers to protocol packets.
-      - CFLST CAIF list implementation.
-      - CFGLUE CAIF Glue. Contains OS Specifics, such as memory
-        allocation, endianness, etc.
 The CAIF Protocol implementation contains:
      - CFCNFG CAIF Configuration layer. Configures the CAIF Protocol
@@ -128,7 +95,7 @@ The CAIF Protocol implementation contains:
        control and remote shutdown requests.
      - CFVEI CAIF VEI layer. Handles CAIF AT Channels on VEI (Virtual
-        External Interface). This layer encodes/decodes VEI frames.
+        External Interface). This layer encodes/decodes VEI frames.
      - CFDGML CAIF Datagram layer. Handles CAIF Datagram layer (IP
        traffic), encodes/decodes Datagram frames.
@@ -170,7 +137,7 @@ The CAIF Protocol implementation contains:
            +---------+     +---------+
                 !              !
            +---------+     +---------+
-            |         |     | Serial  |
+            |         |     | Serial  |
            |         |     | CFSERL  |
            +---------+     +---------+
@@ -186,24 +153,20 @@ In this layered approach the following "rules" apply.
                 layer->dn->transmit(layer->dn, packet);
-Linux Driver Implementation
+CAIF Socket and IP interface
 ===========================
-Linux GPRS Net Device and CAIF socket are implemented on top of the
+The IP interface and CAIF socket API are implemented on top of the
-CAIF Core protocol. The Net device and CAIF socket have an instance of
+CAIF Core protocol. The IP Interface and CAIF socket have an instance of
 'struct cflayer', just like the CAIF Core protocol stack.
 Net device and Socket implement the 'receive()' function defined by
 'struct cflayer', just like the rest of the CAIF stack. In this way, transmit and
 receive of packets is handled as by the rest of the layers: the 'dn->transmit()'
 function is called in order to transmit data.
-The layer on top of the CAIF Core implementation is
-sometimes referred to as the "Client layer".
 Configuration of Link Layer
 ---------------------------
-The Link Layer is implemented as Linux net devices (struct net_device).
+The Link Layer is implemented as Linux network devices (struct net_device).
 Payload handling and registration is done using standard Linux mechanisms.
 The CAIF Protocol relies on a loss-less link layer without implementing
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index ac295399f0d4..820f55344edc 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -22,7 +22,8 @@ This file contains
      4.1.2 RAW socket option CAN_RAW_ERR_FILTER
      4.1.3 RAW socket option CAN_RAW_LOOPBACK
      4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS
-      4.1.5 RAW socket returned message flags
+      4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+      4.1.6 RAW socket returned message flags
    4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
    4.3 connected transport protocols (SOCK_SEQPACKET)
    4.4 unconnected transport protocols (SOCK_DGRAM)
@@ -41,7 +42,8 @@ This file contains
      6.5.1 Netlink interface to set/get devices properties
      6.5.2 Setting the CAN bit-timing
      6.5.3 Starting and stopping the CAN network device
-    6.6 supported CAN hardware
+    6.6 CAN FD (flexible data rate) driver support
+    6.7 supported CAN hardware
  7 Socket CAN resources
@@ -232,16 +234,16 @@ solution for a couple of reasons:
  arbitration problems and error frames caused by the different
  ECUs. The occurrence of detected errors are important for diagnosis
  and have to be logged together with the exact timestamp. For this
-  reason the CAN interface driver can generate so called Error Frames
+  reason the CAN interface driver can generate so called Error Message
-  that can optionally be passed to the user application in the same
+  Frames that can optionally be passed to the user application in the
-  way as other CAN frames. Whenever an error on the physical layer
+  same way as other CAN frames. Whenever an error on the physical layer
  or the MAC layer is detected (e.g. by the CAN controller) the driver
-  creates an appropriate error frame. Error frames can be requested by
+  creates an appropriate error message frame. Error messages frames can
-  the user application using the common CAN filter mechanisms. Inside
+  be requested by the user application using the common CAN filter
-  this filter definition the (interested) type of errors may be
+  mechanisms. Inside this filter definition the (interested) type of
-  selected. The reception of error frames is disabled by default.
+  errors may be selected. The reception of error messages is disabled
-  The format of the CAN error frame is briefly described in the Linux
+  by default. The format of the CAN error message frame is briefly
-  header file "include/linux/can/error.h".
+  described in the Linux header file "include/linux/can/error.h".
 4. How to use Socket CAN
 ------------------------
@@ -273,7 +275,7 @@ solution for a couple of reasons:
    struct can_frame {
            canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
-            __u8    can_dlc; /* data length code: 0 .. 8 */
+            __u8    can_dlc; /* frame payload length in byte (0 .. 8) */
            __u8    data[8] __attribute__((aligned(8)));
    };
@@ -375,6 +377,51 @@ solution for a couple of reasons:
    nbytes = sendto(s, &frame, sizeof(struct can_frame),
                    0, (struct sockaddr*)&addr, sizeof(addr));
+  Remark about CAN FD (flexible data rate) support:
+  Generally the handling of CAN FD is very similar to the formerly described
+  examples. The new CAN FD capable CAN controllers support two different
+  bitrates for the arbitration phase and the payload phase of the CAN FD frame
+  and up to 64 bytes of payload. This extended payload length breaks all the
+  kernel interfaces (ABI) which heavily rely on the CAN frame with fixed eight
+  bytes of payload (struct can_frame) like the CAN_RAW socket. Therefore e.g.
+  the CAN_RAW socket supports a new socket option CAN_RAW_FD_FRAMES that
+  switches the socket into a mode that allows the handling of CAN FD frames
+  and (legacy) CAN frames simultaneously (see section 4.1.5).
+  The struct canfd_frame is defined in include/linux/can.h:
+    struct canfd_frame {
+            canid_t can_id;  /* 32 bit CAN_ID + EFF/RTR/ERR flags */
+            __u8    len;     /* frame payload length in byte (0 .. 64) */
+            __u8    flags;   /* additional flags for CAN FD */
+            __u8    __res0;  /* reserved / padding */
+            __u8    __res1;  /* reserved / padding */
+            __u8    data[64] __attribute__((aligned(8)));
+    };
+  The struct canfd_frame and the existing struct can_frame have the can_id,
+  the payload length and the payload data at the same offset inside their
+  structures. This allows to handle the different structures very similar.
+  When the content of a struct can_frame is copied into a struct canfd_frame
+  all structure elements can be used as-is - only the data[] becomes extended.
+  When introducing the struct canfd_frame it turned out that the data length
+  code (DLC) of the struct can_frame was used as a length information as the
+  length and the DLC has a 1:1 mapping in the range of 0 .. 8. To preserve
+  the easy handling of the length information the canfd_frame.len element
+  contains a plain length value from 0 .. 64. So both canfd_frame.len and
+  can_frame.can_dlc are equal and contain a length information and no DLC.
+  For details about the distinction of CAN and CAN FD capable devices and
+  the mapping to the bus-relevant data length code (DLC), see chapter 6.6.
+  The length of the two CAN(FD) frame structures define the maximum transfer
+  unit (MTU) of the CAN(FD) network interface and skbuff data length. Two
+  definitions are specified for CAN specific MTUs in include/linux/can.h :
+  #define CAN_MTU   (sizeof(struct can_frame))   == 16  => 'legacy' CAN frame
+  #define CANFD_MTU (sizeof(struct canfd_frame)) == 72  => CAN FD frame
  4.1 RAW protocol sockets with can_filters (SOCK_RAW)
  Using CAN_RAW sockets is extensively comparable to the commonly
@@ -383,7 +430,7 @@ solution for a couple of reasons:
  defaults are set at RAW socket binding time:
  - The filters are set to exactly one filter receiving everything
-  - The socket only receives valid data frames (=> no error frames)
+  - The socket only receives valid data frames (=> no error message frames)
  - The loopback of sent CAN frames is enabled (see chapter 3.2)
  - The socket does not receive its own sent frames (in loopback mode)
@@ -434,7 +481,7 @@ solution for a couple of reasons:
  4.1.2 RAW socket option CAN_RAW_ERR_FILTER
  As described in chapter 3.4 the CAN interface driver can generate so
-  called Error Frames that can optionally be passed to the user
+  called Error Message Frames that can optionally be passed to the user
  application in the same way as other CAN frames. The possible
  errors are divided into different error classes that may be filtered
  using the appropriate error mask. To register for every possible
@@ -472,7 +519,69 @@ solution for a couple of reasons:
    setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
               &recv_own_msgs, sizeof(recv_own_msgs));
-  4.1.5 RAW socket returned message flags
+  4.1.5 RAW socket option CAN_RAW_FD_FRAMES
+  CAN FD support in CAN_RAW sockets can be enabled with a new socket option
+  CAN_RAW_FD_FRAMES which is off by default. When the new socket option is
+  not supported by the CAN_RAW socket (e.g. on older kernels), switching the
+  CAN_RAW_FD_FRAMES option returns the error -ENOPROTOOPT.
+  Once CAN_RAW_FD_FRAMES is enabled the application can send both CAN frames
+  and CAN FD frames. OTOH the application has to handle CAN and CAN FD frames
+  when reading from the socket.
+    CAN_RAW_FD_FRAMES enabled:  CAN_MTU and CANFD_MTU are allowed
+    CAN_RAW_FD_FRAMES disabled: only CAN_MTU is allowed (default)
+  Example:
+    [ remember: CANFD_MTU == sizeof(struct canfd_frame) ]
+    struct canfd_frame cfd;
+    nbytes = read(s, &cfd, CANFD_MTU);
+    if (nbytes == CANFD_MTU) {
+            printf("got CAN FD frame with length %d\n", cfd.len);
+            /* cfd.flags contains valid data */
+    } else if (nbytes == CAN_MTU) {
+            printf("got legacy CAN frame with length %d\n", cfd.len);
+            /* cfd.flags is undefined */
+    } else {
+            fprintf(stderr, "read: invalid CAN(FD) frame\n");
+            return 1;
+    }
+    /* the content can be handled independently from the received MTU size */
+    printf("can_id: %X data length: %d data: ", cfd.can_id, cfd.len);
+    for (i = 0; i < cfd.len; i++)
+            printf("%02X ", cfd.data[i]);
+  When reading with size CANFD_MTU only returns CAN_MTU bytes that have
+  been received from the socket a legacy CAN frame has been read into the
+  provided CAN FD structure. Note that the canfd_frame.flags data field is
+  not specified in the struct can_frame and therefore it is only valid in
+  CANFD_MTU sized CAN FD frames.
+  As long as the payload length is <=8 the received CAN frames from CAN FD
+  capable CAN devices can be received and read by legacy sockets too. When
+  user-generated CAN FD frames have a payload length <=8 these can be send
+  by legacy CAN network interfaces too. Sending CAN FD frames with payload
+  length > 8 to a legacy CAN network interface returns an -EMSGSIZE error.
+  Implementation hint for new CAN applications:
+  To build a CAN FD aware application use struct canfd_frame as basic CAN
+  data structure for CAN_RAW based applications. When the application is
+  executed on an older Linux kernel and switching the CAN_RAW_FD_FRAMES
+  socket option returns an error: No problem. You'll get legacy CAN frames
+  or CAN FD frames and can process them the same way.
+  When sending to CAN devices make sure that the device is capable to handle
+  CAN FD frames by checking if the device maximum transfer unit is CANFD_MTU.
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+  4.1.6 RAW socket returned message flags
  When using recvmsg() call, the msg->msg_flags may contain following flags:
@@ -527,7 +636,7 @@ solution for a couple of reasons:
    rcvlist_all - list for unfiltered entries (no filter operations)
    rcvlist_eff - list for single extended frame (EFF) entries
-    rcvlist_err - list for error frames masks
+    rcvlist_err - list for error message frames masks
    rcvlist_fil - list for mask/value filters
    rcvlist_inv - list for mask/value filters (inverse semantic)
    rcvlist_sff - list for single standard frame (SFF) entries
@@ -573,10 +682,13 @@ solution for a couple of reasons:
    dev->type  = ARPHRD_CAN; /* the netdevice hardware type */
    dev->flags = IFF_NOARP;  /* CAN has no arp */
-    dev->mtu   = sizeof(struct can_frame);
+    dev->mtu = CAN_MTU; /* sizeof(struct can_frame) -> legacy CAN interface */
-  The struct can_frame is the payload of each socket buffer in the
+    or alternative, when the controller supports CAN with flexible data rate:
-  protocol family PF_CAN.
+    dev->mtu = CANFD_MTU; /* sizeof(struct canfd_frame) -> CAN FD interface */
+  The struct can_frame or struct canfd_frame is the payload of each socket
+  buffer (skbuff) in the protocol family PF_CAN.
  6.2 local loopback of sent frames
@@ -784,15 +896,41 @@ solution for a couple of reasons:
    $ ip link set canX type can restart-ms 100
  Alternatively, the application may realize the "bus-off" condition
-  by monitoring CAN error frames and do a restart when appropriate with
+  by monitoring CAN error message frames and do a restart when
-  the command:
+  appropriate with the command:
    $ ip link set canX type can restart
-  Note that a restart will also create a CAN error frame (see also
+  Note that a restart will also create a CAN error message frame (see
-  chapter 3.4).
+  also chapter 3.4).
+  6.6 CAN FD (flexible data rate) driver support
+  CAN FD capable CAN controllers support two different bitrates for the
+  arbitration phase and the payload phase of the CAN FD frame. Therefore a
+  second bittiming has to be specified in order to enable the CAN FD bitrate.
+  Additionally CAN FD capable CAN controllers support up to 64 bytes of
+  payload. The representation of this length in can_frame.can_dlc and
+  canfd_frame.len for userspace applications and inside the Linux network
+  layer is a plain value from 0 .. 64 instead of the CAN 'data length code'.
+  The data length code was a 1:1 mapping to the payload length in the legacy
+  CAN frames anyway. The payload length to the bus-relevant DLC mapping is
+  only performed inside the CAN drivers, preferably with the helper
+  functions can_dlc2len() and can_len2dlc().
+  The CAN netdevice driver capabilities can be distinguished by the network
+  devices maximum transfer unit (MTU):
+  MTU = 16 (CAN_MTU)   => sizeof(struct can_frame)   => 'legacy' CAN device
+  MTU = 72 (CANFD_MTU) => sizeof(struct canfd_frame) => CAN FD capable device
+  The CAN device MTU can be retrieved e.g. with a SIOCGIFMTU ioctl() syscall.
+  N.B. CAN FD capable devices can also handle and send legacy CAN frames.
+  FIXME: Add details about the CAN FD controller configuration when available.
-  6.6 Supported CAN hardware
+  6.7 Supported CAN hardware
  Please check the "Kconfig" file in "drivers/net/can" to get an actual
  list of the support CAN hardware. On the Socket CAN project website
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 6f896b94abdc..ca447b35b833 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -48,12 +48,6 @@ min_adv_mss - INTEGER
        The advertised MSS depends on the first hop route MTU, but will
        never be lower than this setting.
-rt_cache_rebuild_count - INTEGER
-        The per net-namespace route cache emergency rebuild threshold.
-        Any net-namespace having its route cache rebuilt due to
-        a hash bucket chain being too long more than this many times
-        will have its route caching disabled
 IP Fragmentation:
 ipfrag_high_thresh - INTEGER
@@ -468,6 +462,19 @@ tcp_syncookies - BOOLEAN
        SYN flood warnings in logs not being really flooded, your server
        is seriously misconfigured.
+tcp_fastopen - INTEGER
+        Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data
+        in the opening SYN packet. To use this feature, the client application
+        must not use connect(). Instead, it should use sendmsg() or sendto()
+        with MSG_FASTOPEN flag which performs a TCP handshake automatically.
+        The values (bitmap) are:
+        1: Enables sending data in the opening SYN on the client
+        5: Enables sending data in the opening SYN on the client regardless
+           of cookie availability.
+        Default: 0
 tcp_syn_retries - INTEGER
        Number of times initial SYNs for an active TCP connection attempt
        will be retransmitted. Should not be higher than 255. Default value
@@ -551,6 +558,25 @@ tcp_thin_dupack - BOOLEAN
        Documentation/networking/tcp-thin.txt
        Default: 0
+tcp_limit_output_bytes - INTEGER
+        Controls TCP Small Queue limit per tcp socket.
+        TCP bulk sender tends to increase packets in flight until it
+        gets losses notifications. With SNDBUF autotuning, this can
+        result in a large amount of packets queued in qdisc/device
+        on the local machine, hurting latency of other flows, for
+        typical pfifo_fast qdiscs.
+        tcp_limit_output_bytes limits the number of bytes on qdisc
+        or device to reduce artificial RTT/cwnd and reduce bufferbloat.
+        Note: For GSO/TSO enabled flows, we try to have at least two
+        packets in flight. Reducing tcp_limit_output_bytes might also
+        reduce the size of individual GSO packet (64KB being the max)
+        Default: 131072
+tcp_challenge_ack_limit - INTEGER
+        Limits number of Challenge ACK sent per second, as recommended
+        in RFC 5961 (Improving TCP's Robustness to Blind In-Window Attacks)
+        Default: 100
 UDP variables:
 udp_mem - vector of 3 INTEGERs: min, pressure, max
@@ -857,9 +883,19 @@ accept_source_route - BOOLEAN
                FALSE (host)
 accept_local - BOOLEAN
-        Accept packets with local source addresses. In combination with
+        Accept packets with local source addresses. In combination
-        suitable routing, this can be used to direct packets between two
+        with suitable routing, this can be used to direct packets
-        local interfaces over the wire and have them accepted properly.
+        between two local interfaces over the wire and have them
+        accepted properly.
+        rp_filter must be set to a non-zero value in order for
+        accept_local to have an effect.
+        default FALSE
+route_localnet - BOOLEAN
+        Do not consider loopback addresses as martian source or destination
+        while routing. This enables the use of 127/8 for local routing purposes.
        default FALSE
 rp_filter - INTEGER
@@ -1398,6 +1434,20 @@ path_max_retrans - INTEGER
        Default: 5
+pf_retrans - INTEGER
+        The number of retransmissions that will be attempted on a given path
+        before traffic is redirected to an alternate transport (should one
+        exist).  Note this is distinct from path_max_retrans, as a path that
+        passes the pf_retrans threshold can still be used.  Its only
+        deprioritized when a transmission path is selected by the stack.  This
+        setting is primarily used to enable fast failover mechanisms without
+        having to reduce path_max_retrans to a very low value.  See:
+        http://www.ietf.org/id/draft-nishida-tsvwg-sctp-failover-05.txt
+        for details.  Note also that a value of pf_retrans > path_max_retrans
+        disables this feature
+        Default: 0
 rto_initial - INTEGER
        The initial round trip timeout value in milliseconds that will be used
        in calculating round trip times.  This is the initial time interval
diff --git a/Documentation/networking/openvswitch.txt b/Documentation/networking/openvswitch.txt
index b8a048b8df3a..8fa2dd1e792e 100644
--- a/Documentation/networking/openvswitch.txt
+++ b/Documentation/networking/openvswitch.txt
@@ -118,7 +118,7 @@ essentially like this, ignoring metadata:
 Naively, to add VLAN support, it makes sense to add a new "vlan" flow
 key attribute to contain the VLAN tag, then continue to decode the
 encapsulated headers beyond the VLAN tag using the existing field
-definitions.  With this change, an TCP packet in VLAN 10 would have a
+definitions.  With this change, a TCP packet in VLAN 10 would have a
 flow key much like this:
    eth(...), vlan(vid=10, pcp=0), eth_type(0x0800), ip(proto=6, ...), tcp(...)
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index 4be0c039edbc..d2a9f43b5546 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -136,16 +136,6 @@ For more information, please review the AMD8131 errata at
 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
+6. Support
-Neterion "s2io" driver in Red Hat and Suse 2.6-based distributions is kept up 
-to date, also the latest "s2io" code (including support for 2.4 kernels) is 
-available via "Support" link on the Neterion site:  http://www.neterion.com.
-For Xframe User Guide (Programming manual), visit ftp site ns1.s2io.com,
-user: linuxdocs password: HALdocs
-7. Support 
 For further support please contact either your 10GbE Xframe NIC vendor (IBM, 
-HP, SGI etc.) or click on the "Support" link on the Neterion site:  
+HP, SGI etc.)
-http://www.neterion.com.
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
index 5cb9a1972460..c676b9cedbd0 100644
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
@@ -257,9 +257,11 @@ reset procedure etc).
 o Makefile
 o stmmac_main.c: main network device driver;
 o stmmac_mdio.c: mdio functions;
+ o stmmac_pci: PCI driver;
+ o stmmac_platform.c: platform driver
 o stmmac_ethtool.c: ethtool support;
 o stmmac_timer.[ch]: timer code used for mitigating the driver dma interrupts
-                      Only tested on ST40 platforms based.
+                      (only tested on ST40 platforms based);
 o stmmac.h: private driver structure;
 o common.h: common definitions and VFTs;
 o descs.h: descriptor structure definitions;
@@ -269,9 +271,11 @@ reset procedure etc).
 o dwmac100_core: MAC 100 core and dma code;
 o dwmac100_dma.c: dma funtions for the MAC chip;
 o dwmac1000.h: specific header file for the MAC;
- o dwmac_lib.c: generic DMA functions shared among chips
+ o dwmac_lib.c: generic DMA functions shared among chips;
- o enh_desc.c: functions for handling enhanced descriptors
+ o enh_desc.c: functions for handling enhanced descriptors;
- o norm_desc.c: functions for handling normal descriptors
+ o norm_desc.c: functions for handling normal descriptors;
+ o chain_mode.c/ring_mode.c:: functions to manage RING/CHAINED modes;
+ o mmc_core.c/mmc.h: Management MAC Counters;
 5) Debug Information
@@ -304,7 +308,27 @@ All these are only useful during the developing stage
 and should never enabled inside the code for general usage.
 In fact, these can generate an huge amount of debug messages.
-6) TODO:
+6) Energy Efficient Ethernet
+Energy Efficient Ethernet(EEE) enables IEEE 802.3 MAC sublayer along
+with a family of Physical layer to operate in the Low power Idle(LPI)
+mode. The EEE mode supports the IEEE 802.3 MAC operation at 100Mbps,
+1000Mbps & 10Gbps.
+The LPI mode allows power saving by switching off parts of the
+communication device functionality when there is no data to be
+transmitted & received. The system on both the side of the link can
+disable some functionalities & save power during the period of low-link
+utilization. The MAC controls whether the system should enter or exit
+the LPI mode & communicate this to PHY.
+As soon as the interface is opened, the driver verifies if the EEE can
+be supported. This is done by looking at both the DMA HW capability
+register and the PHY devices MCD registers.
+To enter in Tx LPI mode the driver needs to have a software timer
+that enable and disable the LPI mode when there is nothing to be
+transmitted.
+7) TODO:
 o XGMAC is not supported.
- o Add the EEE - Energy Efficient Ethernet
 o Add the PTP - precision time protocol
diff --git a/Documentation/networking/vxge.txt b/Documentation/networking/vxge.txt
index d2e2997e6fa0..bb76c667a476 100644
--- a/Documentation/networking/vxge.txt
+++ b/Documentation/networking/vxge.txt
@@ -91,10 +91,3 @@ v)  addr_learn_en
       virtualization environment.
       Valid range: 0,1 (disabled, enabled respectively)
       Default: 0
-4) Troubleshooting:
-------------------
-To resolve an issue with the source code or X3100 series adapter, please collect
-the statistics, register dumps using ethool, relevant logs and email them to
-support@neterion.com.
diff --git a/Documentation/nfc/nfc-hci.txt b/Documentation/nfc/nfc-hci.txt
index 320f9336c781..89a339c9b079 100644
--- a/Documentation/nfc/nfc-hci.txt
+++ b/Documentation/nfc/nfc-hci.txt
@@ -178,3 +178,36 @@ ANY_GET_PARAMETER to the reader A gate to get information on the target
 that was discovered).
 Typically, such an event will be propagated to NFC Core from MSGRXWQ context.
+Error management
+----------------
+Errors that occur synchronously with the execution of an NFC Core request are
+simply returned as the execution result of the request. These are easy.
+Errors that occur asynchronously (e.g. in a background protocol handling thread)
+must be reported such that upper layers don't stay ignorant that something
+went wrong below and know that expected events will probably never happen.
+Handling of these errors is done as follows:
+- driver (pn544) fails to deliver an incoming frame: it stores the error such
+that any subsequent call to the driver will result in this error. Then it calls
+the standard nfc_shdlc_recv_frame() with a NULL argument to report the problem
+above. shdlc stores a EREMOTEIO sticky status, which will trigger SMW to
+report above in turn.
+- SMW is basically a background thread to handle incoming and outgoing shdlc
+frames. This thread will also check the shdlc sticky status and report to HCI
+when it discovers it is not able to run anymore because of an unrecoverable
+error that happened within shdlc or below. If the problem occurs during shdlc
+connection, the error is reported through the connect completion.
+- HCI: if an internal HCI error happens (frame is lost), or HCI is reported an
+error from a lower layer, HCI will either complete the currently executing
+command with that error, or notify NFC Core directly if no command is executing.
+- NFC Core: when NFC Core is notified of an error from below and polling is
+active, it will send a tag discovered event with an empty tag list to the user
+space to let it know that the poll operation will never be able to detect a tag.
+If polling is not active and the error was sticky, lower levels will return it
+at next invocation.
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index 872815cd41d3..504dfe4d52eb 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -583,9 +583,10 @@ for the given device during all power transitions, instead of the respective
 subsystem-level callbacks.  Specifically, if a device's pm_domain pointer is
 not NULL, the ->suspend() callback from the object pointed to by it will be
 executed instead of its subsystem's (e.g. bus type's) ->suspend() callback and
-anlogously for all of the remaining callbacks.  In other words, power management
+analogously for all of the remaining callbacks.  In other words, power
-domain callbacks, if defined for the given device, always take precedence over
+management domain callbacks, if defined for the given device, always take
-the callbacks provided by the device's subsystem (e.g. bus type).
+precedence over the callbacks provided by the device's subsystem (e.g. bus
+type).
 The support for device power management domains is only relevant to platforms
 needing to use the same device driver power management callbacks in many
@@ -598,7 +599,7 @@ it into account in any way.
 Device Low Power (suspend) States
 ---------------------------------
 Device low-power states aren't standard.  One device might only handle
-"on" and "off, while another might support a dozen different versions of
+"on" and "off", while another might support a dozen different versions of
 "on" (how many engines are active?), plus a state that gets back to "on"
 faster than from a full "off".
diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt
index 211831d4095f..2f0ddc15b5ac 100644
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
@@ -112,14 +112,24 @@ CHARGE_COUNTER - the current charge counter (in µAh).  This could easily
 be negative; there is no empty or full value.  It is only useful for
 relative, time-based measurements.
+CONSTANT_CHARGE_CURRENT - constant charge current programmed by charger.
+CONSTANT_CHARGE_VOLTAGE - constant charge voltage programmed by charger.
 ENERGY_FULL, ENERGY_EMPTY - same as above but for energy.
 CAPACITY - capacity in percents.
+CAPACITY_ALERT_MIN - minimum capacity alert value in percents.
+CAPACITY_ALERT_MAX - maximum capacity alert value in percents.
 CAPACITY_LEVEL - capacity level. This corresponds to
 POWER_SUPPLY_CAPACITY_LEVEL_*.
 TEMP - temperature of the power supply.
+TEMP_ALERT_MIN - minimum battery temperature alert value in milli centigrade.
+TEMP_ALERT_MAX - maximum battery temperature alert value in milli centigrade.
 TEMP_AMBIENT - ambient temperature.
+TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert value in milli centigrade.
+TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert value in milli centigrade.
 TIME_TO_EMPTY - seconds left for battery to be considered empty (i.e.
 while battery powers a load)
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt
index ac190cf1963e..92341b84250d 100644
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@ -33,6 +33,11 @@ echo shutdown > /sys/power/disk; echo disk > /sys/power/state
 echo platform > /sys/power/disk; echo disk > /sys/power/state
+. If you would like to write hibernation image to swap and then suspend
+to RAM (provided your platform supports it), you can try
+echo suspend > /sys/power/disk; echo disk > /sys/power/state
 . If you have SATA disks, you'll need recent kernels with SATA suspend
 support. For suspend and resume to work, make sure your disk drivers
 are built into kernel -- not modules. [There's way to make
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index 5df176ed59b8..7561d7ed8e11 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -53,9 +53,20 @@ Struct Resources:
        For printing struct resources. The 'R' and 'r' specifiers result in a
        printed resource with ('R') or without ('r') a decoded flags member.
+Raw buffer as a hex string:
+        %*ph    00 01 02  ...  3f
+        %*phC   00:01:02: ... :3f
+        %*phD   00-01-02- ... -3f
+        %*phN   000102 ... 3f
+        For printing a small buffers (up to 64 bytes long) as a hex string with
+        certain separator. For the larger buffers consider to use
+        print_hex_dump().
 MAC/FDDI addresses:
        %pM     00:01:02:03:04:05
+        %pMR    05:04:03:02:01:00
        %pMF    00-01-02-03-04-05
        %pm     000102030405
@@ -67,6 +78,10 @@ MAC/FDDI addresses:
        the 'M' specifier to use dash ('-') separators instead of the default
        separator.
+        For Bluetooth addresses the 'R' specifier shall be used after the 'M'
+        specifier to use reversed byte order suitable for visual interpretation
+        of Bluetooth addresses which are in the little endian order.
 IPv4 addresses:
        %pI4    1.2.3.4
diff --git a/Documentation/pwm.txt b/Documentation/pwm.txt
new file mode 100644
index 000000000000..554290ebab94
--- /dev/null
+++ b/Documentation/pwm.txt
@@ -0,0 +1,76 @@
+Pulse Width Modulation (PWM) interface
+This provides an overview about the Linux PWM interface
+PWMs are commonly used for controlling LEDs, fans or vibrators in
+cell phones. PWMs with a fixed purpose have no need implementing
+the Linux PWM API (although they could). However, PWMs are often
+found as discrete devices on SoCs which have no fixed purpose. It's
+up to the board designer to connect them to LEDs or fans. To provide
+this kind of flexibility the generic PWM API exists.
+Identifying PWMs
+----------------
+Users of the legacy PWM API use unique IDs to refer to PWM devices.
+Instead of referring to a PWM device via its unique ID, board setup code
+should instead register a static mapping that can be used to match PWM
+consumers to providers, as given in the following example:
+        static struct pwm_lookup board_pwm_lookup[] = {
+                PWM_LOOKUP("tegra-pwm", 0, "pwm-backlight", NULL),
+        };
+        static void __init board_init(void)
+        {
+                ...
+                pwm_add_table(board_pwm_lookup, ARRAY_SIZE(board_pwm_lookup));
+                ...
+        }
+Using PWMs
+----------
+Legacy users can request a PWM device using pwm_request() and free it
+after usage with pwm_free().
+New users should use the pwm_get() function and pass to it the consumer
+device or a consumer name. pwm_put() is used to free the PWM device.
+After being requested a PWM has to be configured using:
+int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns);
+To start/stop toggling the PWM output use pwm_enable()/pwm_disable().
+Implementing a PWM driver
+-------------------------
+Currently there are two ways to implement pwm drivers. Traditionally
+there only has been the barebone API meaning that each driver has
+to implement the pwm_*() functions itself. This means that it's impossible
+to have multiple PWM drivers in the system. For this reason it's mandatory
+for new drivers to use the generic PWM framework.
+A new PWM controller/chip can be added using pwmchip_add() and removed
+again with pwmchip_remove(). pwmchip_add() takes a filled in struct
+pwm_chip as argument which provides a description of the PWM chip, the
+number of PWM devices provider by the chip and the chip-specific
+implementation of the supported PWM operations to the framework.
+Locking
+-------
+The PWM core list manipulations are protected by a mutex, so pwm_request()
+and pwm_free() may not be called from an atomic context. Currently the
+PWM core does not enforce any locking to pwm_enable(), pwm_disable() and
+pwm_config(), so the calling context is currently driver specific. This
+is an issue derived from the former barebone API and should be fixed soon.
+Helpers
+-------
+Currently a PWM can only be configured with period_ns and duty_ns. For several
+use cases freq_hz and duty_percent might be better. Instead of calculating
+this in your driver please consider adding appropriate helpers to the framework.
diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt
index 4ba7db231cb2..197ad59ab9bf 100644
--- a/Documentation/ramoops.txt
+++ b/Documentation/ramoops.txt
@@ -40,6 +40,12 @@ corrupt, but usually it is restorable.
 Setting the ramoops parameters can be done in 2 different manners:
 1. Use the module parameters (which have the names of the variables described
 as before).
+ For quick debugging, you can also reserve parts of memory during boot
+ and then use the reserved memory for ramoops. For example, assuming a machine
+ with > 128 MB of memory, the following kernel command line will tell the
+ kernel to use only the first 128 MB of memory, and place ECC-protected ramoops
+ region at 128 MB boundary:
+ "mem=128M ramoops.mem_address=0x8000000 ramoops.ecc=1"
 2. Use a platform device and set the platform data. The parameters can then
 be set through that platform data. An example of doing that is:
@@ -70,6 +76,14 @@ if (ret) {
        return ret;
 }
+You can specify either RAM memory or peripheral devices' memory. However, when
+specifying RAM, be sure to reserve the memory by issuing memblock_reserve()
+very early in the architecture code, e.g.:
+#include <linux/memblock.h>
+memblock_reserve(ramoops_data.mem_address, ramoops_data.mem_size);
 3. Dump format
 The data dump begins with a header, currently defined as "====" followed by a
@@ -80,3 +94,28 @@ timestamp and a new line. The dump then continues with the actual data.
 The dump data can be read from the pstore filesystem. The format for these
 files is "dmesg-ramoops-N", where N is the record number in memory. To delete
 a stored record from RAM, simply unlink the respective pstore file.
+5. Persistent function tracing
+Persistent function tracing might be useful for debugging software or hardware
+related hangs. The functions call chain log is stored in a "ftrace-ramoops"
+file. Here is an example of usage:
+ # mount -t debugfs debugfs /sys/kernel/debug/
+ # cd /sys/kernel/debug/tracing
+ # echo function > current_tracer
+ # echo 1 > options/func_pstore
+ # reboot -f
+ [...]
+ # mount -t pstore pstore /mnt/
+ # tail /mnt/ftrace-ramoops
+ 0 ffffffff8101ea64  ffffffff8101bcda  native_apic_mem_read <- disconnect_bsp_APIC+0x6a/0xc0
+ 0 ffffffff8101ea44  ffffffff8101bcf6  native_apic_mem_write <- disconnect_bsp_APIC+0x86/0xc0
+ 0 ffffffff81020084  ffffffff8101a4b5  hpet_disable <- native_machine_shutdown+0x75/0x90
+ 0 ffffffff81005f94  ffffffff8101a4bb  iommu_shutdown_noop <- native_machine_shutdown+0x7b/0x90
+ 0 ffffffff8101a6a1  ffffffff8101a437  native_machine_emergency_restart <- native_machine_restart+0x37/0x40
+ 0 ffffffff811f9876  ffffffff8101a73a  acpi_reboot <- native_machine_emergency_restart+0xaa/0x1e0
+ 0 ffffffff8101a514  ffffffff8101a772  mach_reboot_fixups <- native_machine_emergency_restart+0xe2/0x1e0
+ 0 ffffffff811d9c54  ffffffff8101a7a0  __const_udelay <- native_machine_emergency_restart+0x110/0x1e0
+ 0 ffffffff811d9c34  ffffffff811d9c80  __delay <- __const_udelay+0x30/0x40
+ 0 ffffffff811d9d14  ffffffff811d9c3f  delay_tsc <- __delay+0xf/0x20
diff --git a/Documentation/remoteproc.txt b/Documentation/remoteproc.txt
index 70a048cd3fa3..23a09b884bc7 100644
--- a/Documentation/remoteproc.txt
+++ b/Documentation/remoteproc.txt
@@ -36,8 +36,7 @@ cost.
      Note: to use this function you should already have a valid rproc
      handle. There are several ways to achieve that cleanly (devres, pdata,
      the way remoteproc_rpmsg.c does this, or, if this becomes prevalent, we
-      might also consider using dev_archdata for this). See also
+      might also consider using dev_archdata for this).
-      rproc_get_by_name() below.
  void rproc_shutdown(struct rproc *rproc)
    - Power off a remote processor (previously booted with rproc_boot()).
@@ -51,30 +50,6 @@ cost.
        which means that the @rproc handle stays valid even after
        rproc_shutdown() returns, and users can still use it with a subsequent
        rproc_boot(), if needed.
-      - don't call rproc_shutdown() to unroll rproc_get_by_name(), exactly
-        because rproc_shutdown() _does not_ decrement the refcount of @rproc.
-        To decrement the refcount of @rproc, use rproc_put() (but _only_ if
-        you acquired @rproc using rproc_get_by_name()).
-  struct rproc *rproc_get_by_name(const char *name)
-    - Find an rproc handle using the remote processor's name, and then
-      boot it. If it's already powered on, then just immediately return
-      (successfully). Returns the rproc handle on success, and NULL on failure.
-      This function increments the remote processor's refcount, so always
-      use rproc_put() to decrement it back once rproc isn't needed anymore.
-      Note: currently rproc_get_by_name() and rproc_put() are not used anymore
-      by the rpmsg bus and its drivers. We need to scrutinize the use cases
-      that still need them, and see if we can migrate them to use the non
-      name-based boot/shutdown interface.
-  void rproc_put(struct rproc *rproc)
-    - Decrement @rproc's power refcount and shut it down if it reaches zero
-      (essentially by just calling rproc_shutdown), and then decrement @rproc's
-      validity refcount too.
-      After this function returns, @rproc may _not_ be used anymore, and its
-      handle should be considered invalid.
-      This function should be called _iff_ the @rproc handle was grabbed by
-      calling rproc_get_by_name().
 3. Typical usage
@@ -115,21 +90,21 @@ int dummy_rproc_example(struct rproc *my_rproc)
      This function should be used by rproc implementations during
      initialization of the remote processor.
      After creating an rproc handle using this function, and when ready,
-      implementations should then call rproc_register() to complete
+      implementations should then call rproc_add() to complete
      the registration of the remote processor.
      On success, the new rproc is returned, and on failure, NULL.
      Note: _never_ directly deallocate @rproc, even if it was not registered
-      yet. Instead, if you just need to unroll rproc_alloc(), use rproc_free().
+      yet. Instead, when you need to unroll rproc_alloc(), use rproc_put().
-  void rproc_free(struct rproc *rproc)
+  void rproc_put(struct rproc *rproc)
    - Free an rproc handle that was allocated by rproc_alloc.
-      This function should _only_ be used if @rproc was only allocated,
+      This function essentially unrolls rproc_alloc(), by decrementing the
-      but not registered yet.
+      rproc's refcount. It doesn't directly free rproc; that would happen
-      If @rproc was already successfully registered (by calling
+      only if there are no other references to rproc and its refcount now
-      rproc_register()), then use rproc_unregister() instead.
+      dropped to zero.
-  int rproc_register(struct rproc *rproc)
+  int rproc_add(struct rproc *rproc)
    - Register @rproc with the remoteproc framework, after it has been
      allocated with rproc_alloc().
      This is called by the platform-specific rproc implementation, whenever
@@ -142,20 +117,15 @@ int dummy_rproc_example(struct rproc *my_rproc)
      of registering this remote processor, additional virtio drivers might get
      probed.
-  int rproc_unregister(struct rproc *rproc)
+  int rproc_del(struct rproc *rproc)
-    - Unregister a remote processor, and decrement its refcount.
+    - Unroll rproc_add().
-      If its refcount drops to zero, then @rproc will be freed. If not,
-      it will be freed later once the last reference is dropped.
      This function should be called when the platform specific rproc
      implementation decides to remove the rproc device. it should
-      _only_ be called if a previous invocation of rproc_register()
+      _only_ be called if a previous invocation of rproc_add()
      has completed successfully.
-      After rproc_unregister() returns, @rproc is _not_ valid anymore and
+      After rproc_del() returns, @rproc is still valid, and its
-      it shouldn't be used. More specifically, don't call rproc_free()
+      last refcount should be decremented by calling rproc_put().
-      or try to directly free @rproc after rproc_unregister() returns;
-      none of these are needed, and calling them is a bug.
      Returns 0 on success and -EINVAL if @rproc isn't valid.
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 221b81016dba..4e4d0bc9816f 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -875,8 +875,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                setup before initializing the codecs.  This option is
                available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.
                See HD-Audio.txt for details.
-    beep_mode   - Selects the beep registration mode (0=off, 1=on, 2=
+    beep_mode   - Selects the beep registration mode (0=off, 1=on); default
-                dynamic registration via mute switch on/off); the default
                value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.
    
    [Single (global) options]
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 03f7897c6414..a92bba816843 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -15,19 +15,24 @@ ALC260
 ALC262
 ======
-  N/A
+  inv-dmic      Inverted internal mic workaround
 ALC267/268
 ==========
-  N/A
+  inv-dmic      Inverted internal mic workaround
-ALC269
+ALC269/270/275/276/280/282
 ======
  laptop-amic   Laptops with analog-mic input
  laptop-dmic   Laptops with digital-mic input
+  alc269-dmic   Enable ALC269(VA) digital mic workaround
+  alc271-dmic   Enable ALC271X digital mic workaround
+  inv-dmic      Inverted internal mic workaround
+  lenovo-dock   Enables docking station I/O for some Lenovos
 ALC662/663/272
 ==============
+  mario         Chromebook mario model fixup
  asus-mode1    ASUS
  asus-mode2    ASUS
  asus-mode3    ASUS
@@ -36,6 +41,7 @@ ALC662/663/272
  asus-mode6    ASUS
  asus-mode7    ASUS
  asus-mode8    ASUS
+  inv-dmic      Inverted internal mic workaround
 ALC680
 ======
@@ -46,6 +52,8 @@ ALC882/883/885/888/889
  acer-aspire-4930g     Acer Aspire 4930G/5930G/6530G/6930G/7730G
  acer-aspire-8930g     Acer Aspire 8330G/6935G
  acer-aspire           Acer Aspire others
+  inv-dmic      Inverted internal mic workaround
+  no-primary-hp         VAIO Z workaround (for fixed speaker DAC)
 ALC861/660
 ==========
@@ -266,6 +274,10 @@ STAC92HD83*
  dell-s14      Dell laptop
  dell-vostro-3500      Dell Vostro 3500 laptop
  hp-dv7-4000   HP dv-7 4000
+  hp_cNB11_intquad HP CNB models with 4 speakers
+  hp-zephyr     HP Zephyr
+  hp-led        HP with broken BIOS for mute LED
+  hp-inv-led    HP with broken BIOS for inverted mute LED
  auto          BIOS setup (default)
 STAC9872
diff --git a/Documentation/sound/alsa/hdspm.txt b/Documentation/sound/alsa/hdspm.txt
index 7a67ff71a9f8..7ba31948dea7 100644
--- a/Documentation/sound/alsa/hdspm.txt
+++ b/Documentation/sound/alsa/hdspm.txt
@@ -359,4 +359,4 @@ Calling Parameter:
   enable_monitor int array (min = 1, max = 8), 
     "Enable Analog Out on Channel 63/64 by default."
-      note: here the analog output is enabled (but not routed).
-\ No newline at end of file
+      note: here the analog output is enabled (but not routed).
diff --git a/Documentation/stable_kernel_rules.txt b/Documentation/stable_kernel_rules.txt
index 4a7b54bd37e8..b0714d8f678a 100644
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
@@ -1,4 +1,4 @@
-Everything you ever wanted to know about Linux 2.6 -stable releases.
+Everything you ever wanted to know about Linux -stable releases.
 Rules on what kind of patches are accepted, and which ones are not, into the
 "-stable" tree:
@@ -42,10 +42,10 @@ Procedure for submitting patches to the -stable tree:
   cherry-picked than this can be specified in the following format in
   the sign-off area:
-     Cc: <stable@vger.kernel.org> # .32.x: a1f84a3: sched: Check for idle
+     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle
-     Cc: <stable@vger.kernel.org> # .32.x: 1b9508f: sched: Rate-limit newidle
+     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
-     Cc: <stable@vger.kernel.org> # .32.x: fd21073: sched: Fix affinity logic
+     Cc: <stable@vger.kernel.org> # 3.3.x: fd21073: sched: Fix affinity logic
-     Cc: <stable@vger.kernel.org> # .32.x
+     Cc: <stable@vger.kernel.org> # 3.3.x
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
   The tag sequence has the meaning of:
@@ -79,6 +79,15 @@ Review cycle:
   security kernel team, and not go through the normal review cycle.
   Contact the kernel security team for more details on this procedure.
+Trees:
+ - The queues of patches, for both completed versions and in progress
+   versions can be found at:
+        http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+ - The finalized and tagged releases of all stable kernels can be found
+   in separate branches per version at:
+        http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git
 Review committee:
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 13d6166d7a27..88152f214f48 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -32,6 +32,8 @@ Currently, these files are in /proc/sys/fs:
 - nr_open
 - overflowuid
 - overflowgid
+- protected_hardlinks
+- protected_symlinks
 - suid_dumpable
 - super-max
 - super-nr
@@ -157,22 +159,68 @@ The default is 65534.
 ==============================================================
+protected_hardlinks:
+A long-standing class of security issues is the hardlink-based
+time-of-check-time-of-use race, most commonly seen in world-writable
+directories like /tmp. The common method of exploitation of this flaw
+is to cross privilege boundaries when following a given hardlink (i.e. a
+root process follows a hardlink created by another user). Additionally,
+on systems without separated partitions, this stops unauthorized users
+from "pinning" vulnerable setuid/setgid files against being upgraded by
+the administrator, or linking to special files.
+When set to "0", hardlink creation behavior is unrestricted.
+When set to "1" hardlinks cannot be created by users if they do not
+already own the source file, or do not have read/write access to it.
+This protection is based on the restrictions in Openwall and grsecurity.
+==============================================================
+protected_symlinks:
+A long-standing class of security issues is the symlink-based
+time-of-check-time-of-use race, most commonly seen in world-writable
+directories like /tmp. The common method of exploitation of this flaw
+is to cross privilege boundaries when following a given symlink (i.e. a
+root process follows a symlink belonging to another user). For a likely
+incomplete list of hundreds of examples across the years, please see:
+http://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=/tmp
+When set to "0", symlink following behavior is unrestricted.
+When set to "1" symlinks are permitted to be followed only when outside
+a sticky world-writable directory, or when the uid of the symlink and
+follower match, or when the directory owner matches the symlink's owner.
+This protection is based on the restrictions in Openwall and grsecurity.
+==============================================================
 suid_dumpable:
 This value can be used to query and set the core dump mode for setuid
 or otherwise protected/tainted binaries. The modes are
 0 - (default) - traditional behaviour. Any process which has changed
-        privilege levels or is execute only will not be dumped
+        privilege levels or is execute only will not be dumped.
 1 - (debug) - all processes dump core when possible. The core dump is
        owned by the current user and no security is applied. This is
        intended for system debugging situations only. Ptrace is unchecked.
+        This is insecure as it allows regular users to examine the memory
+        contents of privileged processes.
 2 - (suidsafe) - any binary which normally would not be dumped is dumped
-        readable by root only. This allows the end user to remove
+        anyway, but only if the "core_pattern" kernel sysctl is set to
-        such a dump but not access it directly. For security reasons
+        either a pipe handler or a fully qualified path. (For more details
-        core dumps in this mode will not overwrite one another or
+        on this limitation, see CVE-2006-2451.) This mode is appropriate
-        other files. This mode is appropriate when administrators are
+        when administrators are attempting to debug problems in a normal
-        attempting to debug problems in a normal environment.
+        environment, and either have a core dump pipe handler that knows
+        to treat privileged core dumps with care, or specific directory
+        defined for catching core dumps. If a core dump happens without
+        a pipe handler or fully qualifid path, a message will be emitted
+        to syslog warning about the lack of a correct setting.
 ==============================================================
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 96f0ee825bed..dcc2a94ae34e 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -42,7 +42,6 @@ Currently, these files are in /proc/sys/vm:
 - mmap_min_addr
 - nr_hugepages
 - nr_overcommit_hugepages
- nr_pdflush_threads
 - nr_trim_pages         (only if CONFIG_MMU=n)
 - numa_zonelist_order
 - oom_dump_tasks
@@ -426,16 +425,6 @@ See Documentation/vm/hugetlbpage.txt
 ==============================================================
-nr_pdflush_threads
-The current number of pdflush threads.  This value is read-only.
-The value changes according to the number of dirty pages in the system.
-When necessary, additional pdflush threads are created, one per second, up to
-nr_pdflush_threads_max.
-==============================================================
 nr_trim_pages
 This is available only on NOMMU kernels.
@@ -502,9 +491,10 @@ oom_dump_tasks
 Enables a system-wide task dump (excluding kernel threads) to be
 produced when the kernel performs an OOM-killing and includes such
-information as pid, uid, tgid, vm size, rss, cpu, oom_adj score, and
+information as pid, uid, tgid, vm size, rss, nr_ptes, swapents,
-name.  This is helpful to determine why the OOM killer was invoked
+oom_score_adj score, and name.  This is helpful to determine why the
-and to identify the rogue task that caused it.
+OOM killer was invoked, to identify the rogue task that caused it,
+and to determine why the OOM killer chose the task it did to kill.
 If this is set to zero, this information is suppressed.  On very
 large systems with thousands of tasks it may not be feasible to dump
@@ -574,16 +564,24 @@ of physical RAM.  See above.
 page-cluster
-page-cluster controls the number of pages which are written to swap in
+page-cluster controls the number of pages up to which consecutive pages
-a single attempt.  The swap I/O size.
+are read in from swap in a single attempt. This is the swap counterpart
+to page cache readahead.
+The mentioned consecutivity is not in terms of virtual/physical addresses,
+but consecutive on swap space - that means they were swapped out together.
 It is a logarithmic value - setting it to zero means "1 page", setting
 it to 1 means "2 pages", setting it to 2 means "4 pages", etc.
+Zero disables swap readahead completely.
 The default value is three (eight pages at a time).  There may be some
 small benefits in tuning this to a different value if your workload is
 swap-intensive.
+Lower values mean lower latencies for initial faults, but at the same time
+extra faults and I/O delays for following faults if they would have been part of
+that consecutive pages readahead would have brought in.
 =============================================================
 panic_on_oom
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt
index 1733ab947a95..c087dbcf3535 100644
--- a/Documentation/thermal/sysfs-api.txt
+++ b/Documentation/thermal/sysfs-api.txt
@@ -32,7 +32,8 @@ temperature) and throttle appropriate devices.
 1.1 thermal zone device interface
 1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *name,
-                int trips, void *devdata, struct thermal_zone_device_ops *ops)
+                int trips, int mask, void *devdata,
+                struct thermal_zone_device_ops *ops)
    This interface function adds a new thermal zone device (sensor) to
    /sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the
@@ -40,16 +41,17 @@ temperature) and throttle appropriate devices.
    name: the thermal zone name.
    trips: the total number of trip points this thermal zone supports.
+    mask: Bit string: If 'n'th bit is set, then trip point 'n' is writeable.
    devdata: device private data
    ops: thermal zone device call-backs.
        .bind: bind the thermal zone device with a thermal cooling device.
        .unbind: unbind the thermal zone device with a thermal cooling device.
        .get_temp: get the current temperature of the thermal zone.
-        .get_mode: get the current mode (user/kernel) of the thermal zone.
+        .get_mode: get the current mode (enabled/disabled) of the thermal zone.
-            - "kernel" means thermal management is done in kernel.
+            - "enabled" means the kernel thermal management is enabled.
-            - "user" will prevent kernel thermal driver actions upon trip points
+            - "disabled" will prevent kernel thermal driver action upon trip points
              so that user applications can take charge of thermal management.
-        .set_mode: set the mode (user/kernel) of the thermal zone.
+        .set_mode: set the mode (enabled/disabled) of the thermal zone.
        .get_trip_type: get the type of certain trip point.
        .get_trip_temp: get the temperature above which the certain trip point
                        will be fired.
@@ -119,6 +121,7 @@ Thermal zone device sys I/F, created once it's registered:
    |---mode:                   Working mode of the thermal zone
    |---trip_point_[0-*]_temp:  Trip point temperature
    |---trip_point_[0-*]_type:  Trip point type
+    |---trip_point_[0-*]_hyst:  Hysteresis value for this trip point
 Thermal cooling device sys I/F, created once it's registered:
 /sys/class/thermal/cooling_device[0-*]:
@@ -167,14 +170,14 @@ temp
        RO, Required
 mode
-        One of the predefined values in [kernel, user].
+        One of the predefined values in [enabled, disabled].
        This file gives information about the algorithm that is currently
        managing the thermal zone. It can be either default kernel based
        algorithm or user space application.
-        kernel  = Thermal management in kernel thermal zone driver.
+        enabled         = enable Kernel Thermal management.
-        user    = Preventing kernel thermal zone driver actions upon
+        disabled        = Preventing kernel thermal zone driver actions upon
-                  trip points so that user application can take full
+                          trip points so that user application can take full
-                  charge of the thermal management.
+                          charge of the thermal management.
        RW, Optional
 trip_point_[0-*]_temp
@@ -188,6 +191,11 @@ trip_point_[0-*]_type
        thermal zone.
        RO, Optional
+trip_point_[0-*]_hyst
+        The hysteresis value for a trip point, represented as an integer
+        Unit: Celsius
+        RW, Optional
 cdev[0-*]
        Sysfs link to the thermal cooling device node where the sys I/F
        for cooling device throttling control represents.
@@ -248,7 +256,7 @@ method, the sys I/F structure will be built like this:
 |thermal_zone1:
    |---type:                   acpitz
    |---temp:                   37000
-    |---mode:                   kernel
+    |---mode:                   enabled
    |---trip_point_0_temp:      100000
    |---trip_point_0_type:      critical
    |---trip_point_1_temp:      80000
diff --git a/Documentation/usb/mass-storage.txt b/Documentation/usb/mass-storage.txt
new file mode 100644
index 000000000000..e9b9334627bf
--- /dev/null
+++ b/Documentation/usb/mass-storage.txt
@@ -0,0 +1,226 @@
+* Overview
+  Mass Storage Gadget (or MSG) acts as a USB Mass Storage device,
+  appearing to the host as a disk or a CD-ROM drive.  It supports
+  multiple logical units (LUNs).  Backing storage for each LUN is
+  provided by a regular file or a block device, access can be limited
+  to read-only, and gadget can indicate that it is removable and/or
+  CD-ROM (the latter implies read-only access).
+  Its requirements are modest; only a bulk-in and a bulk-out endpoint
+  are needed.  The memory requirement amounts to two 16K buffers.
+  Support is included for full-speed, high-speed and SuperSpeed
+  operation.
+  Note that the driver is slightly non-portable in that it assumes
+  a single memory/DMA buffer will be useable for bulk-in and bulk-out
+  endpoints.  With most device controllers this is not an issue, but
+  there may be some with hardware restrictions that prevent a buffer
+  from being used by more than one endpoint.
+  This document describes how to use the gadget from user space, its
+  relation to mass storage function (or MSF) and different gadgets
+  using it, and how it differs from File Storage Gadget (or FSG).  It
+  will talk only briefly about how to use MSF within composite
+  gadgets.
+* Module parameters
+  The mass storage gadget accepts the following mass storage specific
+  module parameters:
+  - file=filename[,filename...]
+    This parameter lists paths to files or block devices used for
+    backing storage for each logical unit.  There may be at most
+    FSG_MAX_LUNS (8) LUNs set.  If more files are specified, they will
+    be silently ignored.  See also “luns” parameter.
+    *BEWARE* that if a file is used as a backing storage, it may not
+    be modified by any other process.  This is because the host
+    assumes the data does not change without its knowledge.  It may be
+    read, but (if the logical unit is writable) due to buffering on
+    the host side, the contents are not well defined.
+    The size of the logical unit will be rounded down to a full
+    logical block.  The logical block size is 2048 bytes for LUNs
+    simulating CD-ROM, block size of the device if the backing file is
+    a block device, or 512 bytes otherwise.
+  - removable=b[,b...]
+    This parameter specifies whether each logical unit should be
+    removable.  “b” here is either “y”, “Y” or “1” for true or “n”,
+    “N” or “0” for false.
+    If this option is set for a logical unit, gadget will accept an
+    “eject” SCSI request (Start/Stop Unit).  When it is sent, the
+    backing file will be closed to simulate ejection and the logical
+    unit will not be mountable by the host until a new backing file is
+    specified by userspace on the device (see “sysfs entries”
+    section).
+    If a logical unit is not removable (the default), a backing file
+    must be specified for it with the “file” parameter as the module
+    is loaded.  The same applies if the module is built in, no
+    exceptions.
+    The default value of the flag is false, *HOWEVER* it used to be
+    true.  This has been changed to better match File Storage Gadget
+    and because it seems like a saner default after all.  Thus to
+    maintain compatibility with older kernels, it's best to specify
+    the default values.  Also, if one relied on old default, explicit
+    “n” needs to be specified now.
+    Note that “removable” means the logical unit's media can be
+    ejected or removed (as is true for a CD-ROM drive or a card
+    reader).  It does *not* mean that the entire gadget can be
+    unplugged from the host; the proper term for that is
+    “hot-unpluggable”.
+  - cdrom=b[,b...]
+    This parameter specifies whether each logical unit should simulate
+    CD-ROM.  The default is false.
+  - ro=b[,b...]
+    This parameter specifies whether each logical unit should be
+    reported as read only.  This will prevent host from modifying the
+    backing files.
+    Note that if this flag for given logical unit is false but the
+    backing file could not be opened in read/write mode, the gadget
+    will fall back to read only mode anyway.
+    The default value for non-CD-ROM logical units is false; for
+    logical units simulating CD-ROM it is forced to true.
+  - nofua=b[,b...]
+    This parameter specifies whether FUA flag should be ignored in SCSI
+    Write10 and Write12 commands sent to given logical units.
+    MS Windows mounts removable storage in “Removal optimised mode” by
+    default.  All the writes to the media are synchronous, which is
+    achieved by setting the FUA (Force Unit Access) bit in SCSI
+    Write(10,12) commands.  This forces each write to wait until the
+    data has actually been written out and prevents I/O requests
+    aggregation in block layer dramatically decreasing performance.
+    Note that this may mean that if the device is powered from USB and
+    the user unplugs the device without unmounting it first (which at
+    least some Windows users do), the data may be lost.
+    The default value is false.
+  - luns=N
+    This parameter specifies number of logical units the gadget will
+    have.  It is limited by FSG_MAX_LUNS (8) and higher value will be
+    capped.
+    If this parameter is provided, and the number of files specified
+    in “file” argument is greater then the value of “luns”, all excess
+    files will be ignored.
+    If this parameter is not present, the number of logical units will
+    be deduced from the number of files specified in the “file”
+    parameter.  If the file parameter is missing as well, one is
+    assumed.
+  - stall=b
+    Specifies whether the gadget is allowed to halt bulk endpoints.
+    The default is determined according to the type of USB device
+    controller, but usually true.
+  In addition to the above, the gadget also accepts the following
+  parameters defined by the composite framework (they are common to
+  all composite gadgets so just a quick listing):
+  - idVendor      -- USB Vendor ID (16 bit integer)
+  - idProduct     -- USB Product ID (16 bit integer)
+  - bcdDevice     -- USB Device version (BCD) (16 bit integer)
+  - iManufacturer -- USB Manufacturer string (string)
+  - iProduct      -- USB Product string (string)
+  - iSerialNumber -- SerialNumber string (sting)
+* sysfs entries
+  For each logical unit, the gadget creates a directory in the sysfs
+  hierarchy.  Inside of it the following three files are created:
+  - file
+    When read it returns the path to the backing file for the given
+    logical unit.  If there is no backing file (possible only if the
+    logical unit is removable), the content is empty.
+    When written into, it changes the backing file for given logical
+    unit.  This change can be performed even if given logical unit is
+    not specified as removable (but that may look strange to the
+    host).  It may fail, however, if host disallowed medium removal
+    with the Prevent-Allow Medium Removal SCSI command.
+  - ro
+    Reflects the state of ro flag for the given logical unit.  It can
+    be read any time, and written to when there is no backing file
+    open for given logical unit.
+  - nofua
+    Reflects the state of nofua flag for given logical unit.  It can
+    be read and written.
+  Other then those, as usual, the values of module parameters can be
+  read from /sys/module/g_mass_storage/parameters/* files.
+* Other gadgets using mass storage function
+  The Mass Storage Gadget uses the Mass Storage Function to handle
+  mass storage protocol.  As a composite function, MSF may be used by
+  other gadgets as well (eg. g_multi and acm_ms).
+  All of the information in previous sections are valid for other
+  gadgets using MSF, except that support for mass storage related
+  module parameters may be missing, or the parameters may have
+  a prefix.  To figure out whether any of this is true one needs to
+  consult the gadget's documentation or its source code.
+  For examples of how to include mass storage function in gadgets, one
+  may take a look at mass_storage.c, acm_ms.c and multi.c (sorted by
+  complexity).
+* Relation to file storage gadget
+  The Mass Storage Function and thus the Mass Storage Gadget has been
+  based on the File Storage Gadget.  The difference between the two is
+  that MSG is a composite gadget (ie. uses the composite framework)
+  while file storage gadget is a traditional gadget.  From userspace
+  point of view this distinction does not really matter, but from
+  kernel hacker's point of view, this means that (i) MSG does not
+  duplicate code needed for handling basic USB protocol commands and
+  (ii) MSF can be used in any other composite gadget.
+  Because of that, File Storage Gadget has been deprecated and
+  scheduled to be removed in Linux 3.8.  All users need to transition
+  to the Mass Storage Gadget by that time.  The two gadgets behave
+  mostly the same from the outside except:
+  1. In FSG the “removable” and “cdrom” module parameters set the flag
+     for all logical units whereas in MSG they accept a list of y/n
+     values for each logical unit.  If one uses only a single logical
+     unit this does not matter, but if there are more, the y/n value
+     needs to be repeated for each logical unit.
+  2. FSG's “serial”, “vendor”, “product” and “release” module
+     parameters are handled in MSG by the composite layer's parameters
+     named respectively: “iSerialnumber”, “idVendor”, “idProduct” and
+     “bcdDevice”.
+  3. MSG does not support FSG's test mode, thus “transport”,
+     “protocol” and “buflen” FSG's module parameters are not
+     supported.  MSG always uses SCSI protocol with bulk only
+     transport mode and 16 KiB buffers.
diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt
new file mode 100644
index 000000000000..0cb6685c8029
--- /dev/null
+++ b/Documentation/vfio.txt
@@ -0,0 +1,314 @@
+VFIO - "Virtual Function I/O"[1]
+-------------------------------------------------------------------------------
+Many modern system now provide DMA and interrupt remapping facilities
+to help ensure I/O devices behave within the boundaries they've been
+allotted.  This includes x86 hardware with AMD-Vi and Intel VT-d,
+POWER systems with Partitionable Endpoints (PEs) and embedded PowerPC
+systems such as Freescale PAMU.  The VFIO driver is an IOMMU/device
+agnostic framework for exposing direct device access to userspace, in
+a secure, IOMMU protected environment.  In other words, this allows
+safe[2], non-privileged, userspace drivers.
+Why do we want that?  Virtual machines often make use of direct device
+access ("device assignment") when configured for the highest possible
+I/O performance.  From a device and host perspective, this simply
+turns the VM into a userspace driver, with the benefits of
+significantly reduced latency, higher bandwidth, and direct use of
+bare-metal device drivers[3].
+Some applications, particularly in the high performance computing
+field, also benefit from low-overhead, direct device access from
+userspace.  Examples include network adapters (often non-TCP/IP based)
+and compute accelerators.  Prior to VFIO, these drivers had to either
+go through the full development cycle to become proper upstream
+driver, be maintained out of tree, or make use of the UIO framework,
+which has no notion of IOMMU protection, limited interrupt support,
+and requires root privileges to access things like PCI configuration
+space.
+The VFIO driver framework intends to unify these, replacing both the
+KVM PCI specific device assignment code as well as provide a more
+secure, more featureful userspace driver environment than UIO.
+Groups, Devices, and IOMMUs
+-------------------------------------------------------------------------------
+Devices are the main target of any I/O driver.  Devices typically
+create a programming interface made up of I/O access, interrupts,
+and DMA.  Without going into the details of each of these, DMA is
+by far the most critical aspect for maintaining a secure environment
+as allowing a device read-write access to system memory imposes the
+greatest risk to the overall system integrity.
+To help mitigate this risk, many modern IOMMUs now incorporate
+isolation properties into what was, in many cases, an interface only
+meant for translation (ie. solving the addressing problems of devices
+with limited address spaces).  With this, devices can now be isolated
+from each other and from arbitrary memory access, thus allowing
+things like secure direct assignment of devices into virtual machines.
+This isolation is not always at the granularity of a single device
+though.  Even when an IOMMU is capable of this, properties of devices,
+interconnects, and IOMMU topologies can each reduce this isolation.
+For instance, an individual device may be part of a larger multi-
+function enclosure.  While the IOMMU may be able to distinguish
+between devices within the enclosure, the enclosure may not require
+transactions between devices to reach the IOMMU.  Examples of this
+could be anything from a multi-function PCI device with backdoors
+between functions to a non-PCI-ACS (Access Control Services) capable
+bridge allowing redirection without reaching the IOMMU.  Topology
+can also play a factor in terms of hiding devices.  A PCIe-to-PCI
+bridge masks the devices behind it, making transaction appear as if
+from the bridge itself.  Obviously IOMMU design plays a major factor
+as well.
+Therefore, while for the most part an IOMMU may have device level
+granularity, any system is susceptible to reduced granularity.  The
+IOMMU API therefore supports a notion of IOMMU groups.  A group is
+a set of devices which is isolatable from all other devices in the
+system.  Groups are therefore the unit of ownership used by VFIO.
+While the group is the minimum granularity that must be used to
+ensure secure user access, it's not necessarily the preferred
+granularity.  In IOMMUs which make use of page tables, it may be
+possible to share a set of page tables between different groups,
+reducing the overhead both to the platform (reduced TLB thrashing,
+reduced duplicate page tables), and to the user (programming only
+a single set of translations).  For this reason, VFIO makes use of
+a container class, which may hold one or more groups.  A container
+is created by simply opening the /dev/vfio/vfio character device.
+On its own, the container provides little functionality, with all
+but a couple version and extension query interfaces locked away.
+The user needs to add a group into the container for the next level
+of functionality.  To do this, the user first needs to identify the
+group associated with the desired device.  This can be done using
+the sysfs links described in the example below.  By unbinding the
+device from the host driver and binding it to a VFIO driver, a new
+VFIO group will appear for the group as /dev/vfio/$GROUP, where
+$GROUP is the IOMMU group number of which the device is a member.
+If the IOMMU group contains multiple devices, each will need to
+be bound to a VFIO driver before operations on the VFIO group
+are allowed (it's also sufficient to only unbind the device from
+host drivers if a VFIO driver is unavailable; this will make the
+group available, but not that particular device).  TBD - interface
+for disabling driver probing/locking a device.
+Once the group is ready, it may be added to the container by opening
+the VFIO group character device (/dev/vfio/$GROUP) and using the
+VFIO_GROUP_SET_CONTAINER ioctl, passing the file descriptor of the
+previously opened container file.  If desired and if the IOMMU driver
+supports sharing the IOMMU context between groups, multiple groups may
+be set to the same container.  If a group fails to set to a container
+with existing groups, a new empty container will need to be used
+instead.
+With a group (or groups) attached to a container, the remaining
+ioctls become available, enabling access to the VFIO IOMMU interfaces.
+Additionally, it now becomes possible to get file descriptors for each
+device within a group using an ioctl on the VFIO group file descriptor.
+The VFIO device API includes ioctls for describing the device, the I/O
+regions and their read/write/mmap offsets on the device descriptor, as
+well as mechanisms for describing and registering interrupt
+notifications.
+VFIO Usage Example
+-------------------------------------------------------------------------------
+Assume user wants to access PCI device 0000:06:0d.0
+$ readlink /sys/bus/pci/devices/0000:06:0d.0/iommu_group
+../../../../kernel/iommu_groups/26
+This device is therefore in IOMMU group 26.  This device is on the
+pci bus, therefore the user will make use of vfio-pci to manage the
+group:
+# modprobe vfio-pci
+Binding this device to the vfio-pci driver creates the VFIO group
+character devices for this group:
+$ lspci -n -s 0000:06:0d.0
+06:0d.0 0401: 1102:0002 (rev 08)
+# echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind
+# echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id
+Now we need to look at what other devices are in the group to free
+it for use by VFIO:
+$ ls -l /sys/bus/pci/devices/0000:06:0d.0/iommu_group/devices
+total 0
+lrwxrwxrwx. 1 root root 0 Apr 23 16:13 0000:00:1e.0 ->
+        ../../../../devices/pci0000:00/0000:00:1e.0
+lrwxrwxrwx. 1 root root 0 Apr 23 16:13 0000:06:0d.0 ->
+        ../../../../devices/pci0000:00/0000:00:1e.0/0000:06:0d.0
+lrwxrwxrwx. 1 root root 0 Apr 23 16:13 0000:06:0d.1 ->
+        ../../../../devices/pci0000:00/0000:00:1e.0/0000:06:0d.1
+This device is behind a PCIe-to-PCI bridge[4], therefore we also
+need to add device 0000:06:0d.1 to the group following the same
+procedure as above.  Device 0000:00:1e.0 is a bridge that does
+not currently have a host driver, therefore it's not required to
+bind this device to the vfio-pci driver (vfio-pci does not currently
+support PCI bridges).
+The final step is to provide the user with access to the group if
+unprivileged operation is desired (note that /dev/vfio/vfio provides
+no capabilities on its own and is therefore expected to be set to
+mode 0666 by the system).
+# chown user:user /dev/vfio/26
+The user now has full access to all the devices and the iommu for this
+group and can access them as follows:
+        int container, group, device, i;
+        struct vfio_group_status group_status =
+                                        { .argsz = sizeof(group_status) };
+        struct vfio_iommu_x86_info iommu_info = { .argsz = sizeof(iommu_info) };
+        struct vfio_iommu_x86_dma_map dma_map = { .argsz = sizeof(dma_map) };
+        struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
+        /* Create a new container */
+        container = open("/dev/vfio/vfio, O_RDWR);
+        if (ioctl(container, VFIO_GET_API_VERSION) != VFIO_API_VERSION)
+                /* Unknown API version */
+        if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_X86_IOMMU))
+                /* Doesn't support the IOMMU driver we want. */
+        /* Open the group */
+        group = open("/dev/vfio/26", O_RDWR);
+        /* Test the group is viable and available */
+        ioctl(group, VFIO_GROUP_GET_STATUS, &group_status);
+        if (!(group_status.flags & VFIO_GROUP_FLAGS_VIABLE))
+                /* Group is not viable (ie, not all devices bound for vfio) */
+        /* Add the group to the container */
+        ioctl(group, VFIO_GROUP_SET_CONTAINER, &container);
+        /* Enable the IOMMU model we want */
+        ioctl(container, VFIO_SET_IOMMU, VFIO_X86_IOMMU)
+        /* Get addition IOMMU info */
+        ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info);
+        /* Allocate some space and setup a DMA mapping */
+        dma_map.vaddr = mmap(0, 1024 * 1024, PROT_READ | PROT_WRITE,
+                             MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+        dma_map.size = 1024 * 1024;
+        dma_map.iova = 0; /* 1MB starting at 0x0 from device view */
+        dma_map.flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE;
+        ioctl(container, VFIO_IOMMU_MAP_DMA, &dma_map);
+        /* Get a file descriptor for the device */
+        device = ioctl(group, VFIO_GROUP_GET_DEVICE_FD, "0000:06:0d.0");
+        /* Test and setup the device */
+        ioctl(device, VFIO_DEVICE_GET_INFO, &device_info);
+        for (i = 0; i < device_info.num_regions; i++) {
+                struct vfio_region_info reg = { .argsz = sizeof(reg) };
+                reg.index = i;
+                ioctl(device, VFIO_DEVICE_GET_REGION_INFO, &reg);
+                /* Setup mappings... read/write offsets, mmaps
+                 * For PCI devices, config space is a region */
+        }
+        for (i = 0; i < device_info.num_irqs; i++) {
+                struct vfio_irq_info irq = { .argsz = sizeof(irq) };
+                irq.index = i;
+                ioctl(device, VFIO_DEVICE_GET_IRQ_INFO, &reg);
+                /* Setup IRQs... eventfds, VFIO_DEVICE_SET_IRQS */
+        }
+        /* Gratuitous device reset and go... */
+        ioctl(device, VFIO_DEVICE_RESET);
+VFIO User API
+-------------------------------------------------------------------------------
+Please see include/linux/vfio.h for complete API documentation.
+VFIO bus driver API
+-------------------------------------------------------------------------------
+VFIO bus drivers, such as vfio-pci make use of only a few interfaces
+into VFIO core.  When devices are bound and unbound to the driver,
+the driver should call vfio_add_group_dev() and vfio_del_group_dev()
+respectively:
+extern int vfio_add_group_dev(struct iommu_group *iommu_group,
+                              struct device *dev,
+                              const struct vfio_device_ops *ops,
+                              void *device_data);
+extern void *vfio_del_group_dev(struct device *dev);
+vfio_add_group_dev() indicates to the core to begin tracking the
+specified iommu_group and register the specified dev as owned by
+a VFIO bus driver.  The driver provides an ops structure for callbacks
+similar to a file operations structure:
+struct vfio_device_ops {
+        int     (*open)(void *device_data);
+        void    (*release)(void *device_data);
+        ssize_t (*read)(void *device_data, char __user *buf,
+                        size_t count, loff_t *ppos);
+        ssize_t (*write)(void *device_data, const char __user *buf,
+                         size_t size, loff_t *ppos);
+        long    (*ioctl)(void *device_data, unsigned int cmd,
+                         unsigned long arg);
+        int     (*mmap)(void *device_data, struct vm_area_struct *vma);
+};
+Each function is passed the device_data that was originally registered
+in the vfio_add_group_dev() call above.  This allows the bus driver
+an easy place to store its opaque, private data.  The open/release
+callbacks are issued when a new file descriptor is created for a
+device (via VFIO_GROUP_GET_DEVICE_FD).  The ioctl interface provides
+a direct pass through for VFIO_DEVICE_* ioctls.  The read/write/mmap
+interfaces implement the device region access defined by the device's
+own VFIO_DEVICE_GET_REGION_INFO ioctl.
+-------------------------------------------------------------------------------
+[1] VFIO was originally an acronym for "Virtual Function I/O" in its
+initial implementation by Tom Lyon while as Cisco.  We've since
+outgrown the acronym, but it's catchy.
+[2] "safe" also depends upon a device being "well behaved".  It's
+possible for multi-function devices to have backdoors between
+functions and even for single function devices to have alternative
+access to things like PCI config space through MMIO registers.  To
+guard against the former we can include additional precautions in the
+IOMMU driver to group multi-function PCI devices together
+(iommu=group_mf).  The latter we can't prevent, but the IOMMU should
+still provide isolation.  For PCI, SR-IOV Virtual Functions are the
+best indicator of "well behaved", as these are designed for
+virtualization usage models.
+[3] As always there are trade-offs to virtual machine device
+assignment that are beyond the scope of VFIO.  It's expected that
+future IOMMU technologies will reduce some, but maybe not all, of
+these trade-offs.
+[4] In this case the device is below a PCI bridge, so transactions
+from either function of the device are indistinguishable to the iommu:
+-[0000:00]-+-1e.0-[06]--+-0d.0
+                        \-0d.1
+00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev 90)
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828
index 7b59e953c4bf..a8a65753e544 100644
--- a/Documentation/video4linux/CARDLIST.au0828
+++ b/Documentation/video4linux/CARDLIST.au0828
@@ -3,4 +3,4 @@
  2 -> Hauppauge HVR850                         (au0828)        [2040:7240]
  3 -> DViCO FusionHDTV USB                     (au0828)        [0fe9:d620]
  4 -> Hauppauge HVR950Q rev xxF8               (au0828)        [2040:7201,2040:7211,2040:7281]
-  5 -> Hauppauge Woodbury                       (au0828)        [2040:8200]
+  5 -> Hauppauge Woodbury                       (au0828)        [05e1:0480,2040:8200]
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index b753906c7183..581f666a76cf 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -159,3 +159,4 @@
 158 -> Geovision GV-800(S) (slave)                         [800b:763d,800c:763d,800d:763d]
 159 -> ProVideo PV183                                      [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]
 160 -> Tongwei Video Technology TD-3116                    [f200:3116]
+161 -> Aposonic W-DVR                                      [0279:0228]
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index f316d1816fcd..652aecd13199 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -18,7 +18,7 @@
 17 -> NetUP Dual DVB-S2 CI                                [1b55:2a2c]
 18 -> Hauppauge WinTV-HVR1270                             [0070:2211]
 19 -> Hauppauge WinTV-HVR1275                             [0070:2215,0070:221d,0070:22f2]
- 20 -> Hauppauge WinTV-HVR1255                             [0070:2251,0070:2259,0070:22f1]
+ 20 -> Hauppauge WinTV-HVR1255                             [0070:2251,0070:22f1]
 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]
@@ -33,3 +33,5 @@
 32 -> MPX-885
 33 -> Mygica X8507                                        [14f1:8502]
 34 -> TerraTec Cinergy T PCIe Dual                        [153b:117e]
+ 35 -> TeVii S471                                          [d471:9022]
+ 36 -> Hauppauge WinTV-HVR1255                             [0070:2259]
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 34f3b330e5f4..94d9025aa82d 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -188,3 +188,4 @@
 187 -> Beholder BeholdTV 503 FM                 [5ace:5030]
 188 -> Sensoray 811/911                         [6000:0811,6000:0911]
 189 -> Kworld PC150-U                           [17de:a134]
+190 -> Asus My Cinema PS3-100                   [1043:48cd]
diff --git a/Documentation/video4linux/cpia2_overview.txt b/Documentation/video4linux/cpia2_overview.txt
index a6e53665216b..ad6adbedfe50 100644
--- a/Documentation/video4linux/cpia2_overview.txt
+++ b/Documentation/video4linux/cpia2_overview.txt
@@ -35,4 +35,4 @@ the camera.  There are three modes for this.  Block mode requests a number
 of contiguous registers.  Random mode reads or writes random registers with
 a tuple structure containing address/value pairs.  The repeat mode is only
 used by VP4 to load a firmware patch.  It contains a starting address and
-a sequence of bytes to be written into a gpio port.
-\ No newline at end of file
+a sequence of bytes to be written into a gpio port.
diff --git a/Documentation/video4linux/stv680.txt b/Documentation/video4linux/stv680.txt
index 4f8946f32f51..e3de33645308 100644
--- a/Documentation/video4linux/stv680.txt
+++ b/Documentation/video4linux/stv680.txt
@@ -50,4 +50,4 @@ The latest info on this driver can be found at:
 http://personal.clt.bellsouth.net/~kjsisson or at
 http://stv0680-usb.sourceforge.net
-Any questions to me can be send to:  kjsisson@bellsouth.net
-\ No newline at end of file
+Any questions to me can be send to:  kjsisson@bellsouth.net
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt
index 1f5905270050..89318be6c1d2 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -594,6 +594,15 @@ You should also set these fields:
  unlocked_ioctl file operation is called this lock will be taken by the
  core and released afterwards. See the next section for more details.
+- queue: a pointer to the struct vb2_queue associated with this device node.
+  If queue is non-NULL, and queue->lock is non-NULL, then queue->lock is
+  used for the queuing ioctls (VIDIOC_REQBUFS, CREATE_BUFS, QBUF, DQBUF,
+  QUERYBUF, PREPARE_BUF, STREAMON and STREAMOFF) instead of the lock above.
+  That way the vb2 queuing framework does not have to wait for other ioctls.
+  This queue pointer is also used by the vb2 helper functions to check for
+  queuing ownership (i.e. is the filehandle calling it allowed to do the
+  operation).
 - prio: keeps track of the priorities. Used to implement VIDIOC_G/S_PRIORITY.
  If left to NULL, then it will use the struct v4l2_prio_state in v4l2_device.
  If you want to have a separate priority state per (group of) device node(s),
@@ -647,47 +656,43 @@ manually set the struct media_entity type and name fields.
 A reference to the entity will be automatically acquired/released when the
 video device is opened/closed.
-v4l2_file_operations and locking
+ioctls and locking
--------------------------------
+------------------
-You can set a pointer to a mutex_lock in struct video_device. Usually this
-will be either a top-level mutex or a mutex per device node. By default this
-lock will be used for unlocked_ioctl, but you can disable locking for
-selected ioctls by calling:
-        void v4l2_disable_ioctl_locking(struct video_device *vdev, unsigned int cmd);
-E.g.: v4l2_disable_ioctl_locking(vdev, VIDIOC_DQBUF);
-You have to call this before you register the video_device.
+The V4L core provides optional locking services. The main service is the
+lock field in struct video_device, which is a pointer to a mutex. If you set
+this pointer, then that will be used by unlocked_ioctl to serialize all ioctls.
-Particularly with USB drivers where certain commands such as setting controls
+If you are using the videobuf2 framework, then there is a second lock that you
-can take a long time you may want to do your own locking for the buffer queuing
+can set: video_device->queue->lock. If set, then this lock will be used instead
-ioctls.
+of video_device->lock to serialize all queuing ioctls (see the previous section
+for the full list of those ioctls).
-If you want still finer-grained locking then you have to set mutex_lock to NULL
+The advantage of using a different lock for the queuing ioctls is that for some
-and do you own locking completely.
+drivers (particularly USB drivers) certain commands such as setting controls
+can take a long time, so you want to use a separate lock for the buffer queuing
+ioctls. That way your VIDIOC_DQBUF doesn't stall because the driver is busy
+changing the e.g. exposure of the webcam.
-It is up to the driver developer to decide which method to use. However, if
+Of course, you can always do all the locking yourself by leaving both lock
-your driver has high-latency operations (for example, changing the exposure
+pointers at NULL.
-of a USB webcam might take a long time), then you might be better off with
-doing your own locking if you want to allow the user to do other things with
-the device while waiting for the high-latency command to finish.
-If a lock is specified then all ioctl commands will be serialized on that
+If you use the old videobuf then you must pass the video_device lock to the
-lock. If you use videobuf then you must pass the same lock to the videobuf
+videobuf queue initialize function: if videobuf has to wait for a frame to
-queue initialize function: if videobuf has to wait for a frame to arrive, then
+arrive, then it will temporarily unlock the lock and relock it afterwards. If
-it will temporarily unlock the lock and relock it afterwards. If your driver
+your driver also waits in the code, then you should do the same to allow other
-also waits in the code, then you should do the same to allow other processes
+processes to access the device node while the first process is waiting for
-to access the device node while the first process is waiting for something.
+something.
 In the case of videobuf2 you will need to implement the wait_prepare and
-wait_finish callbacks to unlock/lock if applicable. In particular, if you use
+wait_finish callbacks to unlock/lock if applicable. If you use the queue->lock
-the lock in struct video_device then you must unlock/lock this mutex in
+pointer, then you can use the helper functions vb2_ops_wait_prepare/finish.
-wait_prepare and wait_finish.
+The implementation of a hotplug disconnect should also take the lock from
-The implementation of a hotplug disconnect should also take the lock before
+video_device before calling v4l2_device_disconnect. If you are also using
-calling v4l2_device_disconnect.
+video_device->queue->lock, then you have to first lock video_device->queue->lock
+followed by video_device->lock. That way you can be sure no ioctl is running
+when you call v4l2_device_disconnect.
 video_device registration
 -------------------------
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 2c9948379469..bf33aaa4c59f 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -1946,6 +1946,40 @@ the guest using the specified gsi pin.  The irqfd is removed using
 the KVM_IRQFD_FLAG_DEASSIGN flag, specifying both kvm_irqfd.fd
 and kvm_irqfd.gsi.
+4.76 KVM_PPC_ALLOCATE_HTAB
+Capability: KVM_CAP_PPC_ALLOC_HTAB
+Architectures: powerpc
+Type: vm ioctl
+Parameters: Pointer to u32 containing hash table order (in/out)
+Returns: 0 on success, -1 on error
+This requests the host kernel to allocate an MMU hash table for a
+guest using the PAPR paravirtualization interface.  This only does
+anything if the kernel is configured to use the Book 3S HV style of
+virtualization.  Otherwise the capability doesn't exist and the ioctl
+returns an ENOTTY error.  The rest of this description assumes Book 3S
+HV.
+There must be no vcpus running when this ioctl is called; if there
+are, it will do nothing and return an EBUSY error.
+The parameter is a pointer to a 32-bit unsigned integer variable
+containing the order (log base 2) of the desired size of the hash
+table, which must be between 18 and 46.  On successful return from the
+ioctl, it will have been updated with the order of the hash table that
+was allocated.
+If no hash table has been allocated when any vcpu is asked to run
+(with the KVM_RUN ioctl), the host kernel will allocate a
+default-sized hash table (16 MB).
+If this ioctl is called when a hash table has already been allocated,
+the kernel will clear out the existing hash table (zero all HPTEs) and
+return the hash table order in the parameter.  (If the guest is using
+the virtualized real-mode area (VRMA) facility, the kernel will
+re-create the VMRA HPTEs on the next KVM_RUN of any vcpu.)
 5. The kvm_run structure
 ------------------------
diff --git a/Documentation/virtual/kvm/locking.txt b/Documentation/virtual/kvm/locking.txt
index 3b4cd3bf5631..41b7ac9884b5 100644
--- a/Documentation/virtual/kvm/locking.txt
+++ b/Documentation/virtual/kvm/locking.txt
@@ -6,7 +6,129 @@ KVM Lock Overview
 (to be written)
-2. Reference
+2: Exception
+------------
+Fast page fault:
+Fast page fault is the fast path which fixes the guest page fault out of
+the mmu-lock on x86. Currently, the page fault can be fast only if the
+shadow page table is present and it is caused by write-protect, that means
+we just need change the W bit of the spte.
+What we use to avoid all the race is the SPTE_HOST_WRITEABLE bit and
+SPTE_MMU_WRITEABLE bit on the spte:
+- SPTE_HOST_WRITEABLE means the gfn is writable on host.
+- SPTE_MMU_WRITEABLE means the gfn is writable on mmu. The bit is set when
+  the gfn is writable on guest mmu and it is not write-protected by shadow
+  page write-protection.
+On fast page fault path, we will use cmpxchg to atomically set the spte W
+bit if spte.SPTE_HOST_WRITEABLE = 1 and spte.SPTE_WRITE_PROTECT = 1, this
+is safe because whenever changing these bits can be detected by cmpxchg.
+But we need carefully check these cases:
+1): The mapping from gfn to pfn
+The mapping from gfn to pfn may be changed since we can only ensure the pfn
+is not changed during cmpxchg. This is a ABA problem, for example, below case
+will happen:
+At the beginning:
+gpte = gfn1
+gfn1 is mapped to pfn1 on host
+spte is the shadow page table entry corresponding with gpte and
+spte = pfn1
+   VCPU 0                           VCPU0
+on fast page fault path:
+   old_spte = *spte;
+                                 pfn1 is swapped out:
+                                    spte = 0;
+                                 pfn1 is re-alloced for gfn2.
+                                 gpte is changed to point to
+                                 gfn2 by the guest:
+                                    spte = pfn1;
+   if (cmpxchg(spte, old_spte, old_spte+W)
+        mark_page_dirty(vcpu->kvm, gfn1)
+             OOPS!!!
+We dirty-log for gfn1, that means gfn2 is lost in dirty-bitmap.
+For direct sp, we can easily avoid it since the spte of direct sp is fixed
+to gfn. For indirect sp, before we do cmpxchg, we call gfn_to_pfn_atomic()
+to pin gfn to pfn, because after gfn_to_pfn_atomic():
+- We have held the refcount of pfn that means the pfn can not be freed and
+  be reused for another gfn.
+- The pfn is writable that means it can not be shared between different gfns
+  by KSM.
+Then, we can ensure the dirty bitmaps is correctly set for a gfn.
+Currently, to simplify the whole things, we disable fast page fault for
+indirect shadow page.
+2): Dirty bit tracking
+In the origin code, the spte can be fast updated (non-atomically) if the
+spte is read-only and the Accessed bit has already been set since the
+Accessed bit and Dirty bit can not be lost.
+But it is not true after fast page fault since the spte can be marked
+writable between reading spte and updating spte. Like below case:
+At the beginning:
+spte.W = 0
+spte.Accessed = 1
+   VCPU 0                                       VCPU0
+In mmu_spte_clear_track_bits():
+   old_spte = *spte;
+   /* 'if' condition is satisfied. */
+   if (old_spte.Accssed == 1 &&
+        old_spte.W == 0)
+      spte = 0ull;
+                                         on fast page fault path:
+                                             spte.W = 1
+                                         memory write on the spte:
+                                             spte.Dirty = 1
+   else
+      old_spte = xchg(spte, 0ull)
+   if (old_spte.Accssed == 1)
+      kvm_set_pfn_accessed(spte.pfn);
+   if (old_spte.Dirty == 1)
+      kvm_set_pfn_dirty(spte.pfn);
+      OOPS!!!
+The Dirty bit is lost in this case.
+In order to avoid this kind of issue, we always treat the spte as "volatile"
+if it can be updated out of mmu-lock, see spte_has_volatile_bits(), it means,
+the spte is always atomicly updated in this case.
+3): flush tlbs due to spte updated
+If the spte is updated from writable to readonly, we should flush all TLBs,
+otherwise rmap_write_protect will find a read-only spte, even though the
+writable spte might be cached on a CPU's TLB.
+As mentioned before, the spte can be updated to writable out of mmu-lock on
+fast page fault path, in order to easily audit the path, we see if TLBs need
+be flushed caused by this reason in mmu_spte_update() since this is a common
+function to update spte (present -> present).
+Since the spte is "volatile" if it can be updated out of mmu-lock, we always
+atomicly update the spte, the race caused by fast page fault can be avoided,
+See the comments in spte_has_volatile_bits() and mmu_spte_update().
+3. Reference
 ------------
 Name:           kvm_lock
@@ -23,3 +145,9 @@ Arch:		x86
 Protects:       - kvm_arch::{last_tsc_write,last_tsc_nsec,last_tsc_offset}
                - tsc offset in vmcb
 Comment:        'raw' because updating the tsc offsets must not be preempted.
+Name:           kvm->mmu_lock
+Type:           spinlock_t
+Arch:           any
+Protects:       -shadow page/shadow tlb entry
+Comment:        it is a spinlock since it is used in mmu notifier.
diff --git a/Documentation/virtual/kvm/msr.txt b/Documentation/virtual/kvm/msr.txt
index 96b41bd97523..730471048583 100644
--- a/Documentation/virtual/kvm/msr.txt
+++ b/Documentation/virtual/kvm/msr.txt
@@ -223,3 +223,36 @@ MSR_KVM_STEAL_TIME: 0x4b564d03
                steal: the amount of time in which this vCPU did not run, in
                nanoseconds. Time during which the vcpu is idle, will not be
                reported as steal time.
+MSR_KVM_EOI_EN: 0x4b564d04
+        data: Bit 0 is 1 when PV end of interrupt is enabled on the vcpu; 0
+        when disabled.  Bit 1 is reserved and must be zero.  When PV end of
+        interrupt is enabled (bit 0 set), bits 63-2 hold a 4-byte aligned
+        physical address of a 4 byte memory area which must be in guest RAM and
+        must be zeroed.
+        The first, least significant bit of 4 byte memory location will be
+        written to by the hypervisor, typically at the time of interrupt
+        injection.  Value of 1 means that guest can skip writing EOI to the apic
+        (using MSR or MMIO write); instead, it is sufficient to signal
+        EOI by clearing the bit in guest memory - this location will
+        later be polled by the hypervisor.
+        Value of 0 means that the EOI write is required.
+        It is always safe for the guest to ignore the optimization and perform
+        the APIC EOI write anyway.
+        Hypervisor is guaranteed to only modify this least
+        significant bit while in the current VCPU context, this means that
+        guest does not need to use either lock prefix or memory ordering
+        primitives to synchronise with the hypervisor.
+        However, hypervisor can set and clear this memory bit at any time:
+        therefore to make sure hypervisor does not interrupt the
+        guest and clear the least significant bit in the memory area
+        in the window between guest testing it to detect
+        whether it can skip EOI apic write and between guest
+        clearing it to signal EOI to the hypervisor,
+        guest must both read the least significant bit in the memory area and
+        clear it using a single CPU instruction, such as test and clear, or
+        compare and exchange.
diff --git a/Documentation/virtual/kvm/ppc-pv.txt b/Documentation/virtual/kvm/ppc-pv.txt
index 6e7c37050930..4911cf95c67e 100644
--- a/Documentation/virtual/kvm/ppc-pv.txt
+++ b/Documentation/virtual/kvm/ppc-pv.txt
@@ -109,8 +109,6 @@ The following bits are safe to be set inside the guest:
  MSR_EE
  MSR_RI
-  MSR_CR
-  MSR_ME
 If any other bit changes in the MSR, please still use mtmsr(d).
diff --git a/Documentation/vm/frontswap.txt b/Documentation/vm/frontswap.txt
index 37067cf455f4..5ef2d1366425 100644
--- a/Documentation/vm/frontswap.txt
+++ b/Documentation/vm/frontswap.txt
@@ -25,7 +25,7 @@ with the specified swap device number (aka "type").  A "store" will
 copy the page to transcendent memory and associate it with the type and
 offset associated with the page. A "load" will copy the page, if found,
 from transcendent memory into kernel memory, but will NOT remove the page
-from from transcendent memory.  An "invalidate_page" will remove the page
+from transcendent memory.  An "invalidate_page" will remove the page
 from transcendent memory and an "invalidate_area" will remove ALL pages
 associated with the swap type (e.g., like swapoff) and notify the "device"
 to refuse further stores with that swap type.
@@ -99,7 +99,7 @@ server configured with a large amount of RAM... without pre-configuring
 how much of the RAM is available for each of the clients!
 In the virtual case, the whole point of virtualization is to statistically
-multiplex physical resources acrosst the varying demands of multiple
+multiplex physical resources across the varying demands of multiple
 virtual machines.  This is really hard to do with RAM and efforts to do
 it well with no kernel changes have essentially failed (except in some
 well-publicized special-case workloads).
diff --git a/Documentation/w1/slaves/w1_ds28e04 b/Documentation/w1/slaves/w1_ds28e04
new file mode 100644
index 000000000000..85bc9a7e02fe
--- /dev/null
+++ b/Documentation/w1/slaves/w1_ds28e04
@@ -0,0 +1,36 @@
+Kernel driver w1_ds28e04
+========================
+Supported chips:
+  * Maxim DS28E04-100 4096-Bit Addressable 1-Wire EEPROM with PIO
+supported family codes:
+        W1_FAMILY_DS28E04       0x1C
+Author: Markus Franke, <franke.m@sebakmt.com> <franm@hrz.tu-chemnitz.de>
+Description
+-----------
+Support is provided through the sysfs files "eeprom" and "pio". CRC checking
+during memory accesses can optionally be enabled/disabled via the device
+attribute "crccheck". The strong pull-up can optionally be enabled/disabled
+via the module parameter "w1_strong_pullup".
+Memory Access
+        A read operation on the "eeprom" file reads the given amount of bytes
+        from the EEPROM of the DS28E04.
+        A write operation on the "eeprom" file writes the given byte sequence
+        to the EEPROM of the DS28E04. If CRC checking mode is enabled only
+        fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 30
+        and 31) are allowed to be written.
+PIO Access
+        The 2 PIOs of the DS28E04-100 are accessible via the "pio" sysfs file.
+        The current status of the PIO's is returned as an 8 bit value. Bit 0/1
+        represent the state of PIO_0/PIO_1. Bits 2..7 do not care. The PIO's are
+        driven low-active, i.e. the driver delivers/expects low-active values.
diff --git a/Documentation/workqueue.txt b/Documentation/workqueue.txt
index a0b577de918f..a6ab4b62d926 100644
--- a/Documentation/workqueue.txt
+++ b/Documentation/workqueue.txt
@@ -89,25 +89,28 @@ called thread-pools.
 The cmwq design differentiates between the user-facing workqueues that
 subsystems and drivers queue work items on and the backend mechanism
-which manages thread-pool and processes the queued work items.
+which manages thread-pools and processes the queued work items.
 The backend is called gcwq.  There is one gcwq for each possible CPU
-and one gcwq to serve work items queued on unbound workqueues.
+and one gcwq to serve work items queued on unbound workqueues.  Each
+gcwq has two thread-pools - one for normal work items and the other
+for high priority ones.
 Subsystems and drivers can create and queue work items through special
 workqueue API functions as they see fit. They can influence some
 aspects of the way the work items are executed by setting flags on the
 workqueue they are putting the work item on. These flags include
-things like CPU locality, reentrancy, concurrency limits and more. To
+things like CPU locality, reentrancy, concurrency limits, priority and
-get a detailed overview refer to the API description of
+more.  To get a detailed overview refer to the API description of
 alloc_workqueue() below.
-When a work item is queued to a workqueue, the target gcwq is
+When a work item is queued to a workqueue, the target gcwq and
-determined according to the queue parameters and workqueue attributes
+thread-pool is determined according to the queue parameters and
-and appended on the shared worklist of the gcwq.  For example, unless
+workqueue attributes and appended on the shared worklist of the
-specifically overridden, a work item of a bound workqueue will be
+thread-pool.  For example, unless specifically overridden, a work item
-queued on the worklist of exactly that gcwq that is associated to the
+of a bound workqueue will be queued on the worklist of either normal
-CPU the issuer is running on.
+or highpri thread-pool of the gcwq that is associated to the CPU the
+issuer is running on.
 For any worker pool implementation, managing the concurrency level
 (how many execution contexts are active) is an important issue.  cmwq
@@ -115,26 +118,26 @@ tries to keep the concurrency at a minimal but sufficient level.
 Minimal to save resources and sufficient in that the system is used at
 its full capacity.
-Each gcwq bound to an actual CPU implements concurrency management by
+Each thread-pool bound to an actual CPU implements concurrency
-hooking into the scheduler.  The gcwq is notified whenever an active
+management by hooking into the scheduler.  The thread-pool is notified
-worker wakes up or sleeps and keeps track of the number of the
+whenever an active worker wakes up or sleeps and keeps track of the
-currently runnable workers.  Generally, work items are not expected to
+number of the currently runnable workers.  Generally, work items are
-hog a CPU and consume many cycles.  That means maintaining just enough
+not expected to hog a CPU and consume many cycles.  That means
-concurrency to prevent work processing from stalling should be
+maintaining just enough concurrency to prevent work processing from
-optimal.  As long as there are one or more runnable workers on the
+stalling should be optimal.  As long as there are one or more runnable
-CPU, the gcwq doesn't start execution of a new work, but, when the
+workers on the CPU, the thread-pool doesn't start execution of a new
-last running worker goes to sleep, it immediately schedules a new
+work, but, when the last running worker goes to sleep, it immediately
-worker so that the CPU doesn't sit idle while there are pending work
+schedules a new worker so that the CPU doesn't sit idle while there
-items.  This allows using a minimal number of workers without losing
+are pending work items.  This allows using a minimal number of workers
-execution bandwidth.
+without losing execution bandwidth.
 Keeping idle workers around doesn't cost other than the memory space
 for kthreads, so cmwq holds onto idle ones for a while before killing
 them.
 For an unbound wq, the above concurrency management doesn't apply and
-the gcwq for the pseudo unbound CPU tries to start executing all work
+the thread-pools for the pseudo unbound CPU try to start executing all
-items as soon as possible.  The responsibility of regulating
+work items as soon as possible.  The responsibility of regulating
 concurrency level is on the users.  There is also a flag to mark a
 bound wq to ignore the concurrency management.  Please refer to the
 API section for details.
@@ -205,31 +208,22 @@ resources, scheduled and executed.
  WQ_HIGHPRI
-        Work items of a highpri wq are queued at the head of the
+        Work items of a highpri wq are queued to the highpri
-        worklist of the target gcwq and start execution regardless of
+        thread-pool of the target gcwq.  Highpri thread-pools are
-        the current concurrency level.  In other words, highpri work
+        served by worker threads with elevated nice level.
-        items will always start execution as soon as execution
-        resource is available.
-        Ordering among highpri work items is preserved - a highpri
+        Note that normal and highpri thread-pools don't interact with
-        work item queued after another highpri work item will start
+        each other.  Each maintain its separate pool of workers and
-        execution after the earlier highpri work item starts.
+        implements concurrency management among its workers.
-        Although highpri work items are not held back by other
-        runnable work items, they still contribute to the concurrency
-        level.  Highpri work items in runnable state will prevent
-        non-highpri work items from starting execution.
-        This flag is meaningless for unbound wq.
  WQ_CPU_INTENSIVE
        Work items of a CPU intensive wq do not contribute to the
        concurrency level.  In other words, runnable CPU intensive
-        work items will not prevent other work items from starting
+        work items will not prevent other work items in the same
-        execution.  This is useful for bound work items which are
+        thread-pool from starting execution.  This is useful for bound
-        expected to hog CPU cycles so that their execution is
+        work items which are expected to hog CPU cycles so that their
-        regulated by the system scheduler.
+        execution is regulated by the system scheduler.
        Although CPU intensive work items don't contribute to the
        concurrency level, start of their executions is still
@@ -239,14 +233,6 @@ resources, scheduled and executed.
        This flag is meaningless for unbound wq.
-  WQ_HIGHPRI | WQ_CPU_INTENSIVE
-        This combination makes the wq avoid interaction with
-        concurrency management completely and behave as a simple
-        per-CPU execution context provider.  Work items queued on a
-        highpri CPU-intensive wq start execution as soon as resources
-        are available and don't affect execution of other work items.
 @max_active:
 @max_active determines the maximum number of execution contexts per
@@ -328,20 +314,7 @@ If @max_active == 2,
 35             w2 wakes up and finishes
 Now, let's assume w1 and w2 are queued to a different wq q1 which has
-WQ_HIGHPRI set,
+WQ_CPU_INTENSIVE set,
- TIME IN MSECS  EVENT
- 0              w1 and w2 start and burn CPU
- 5              w1 sleeps
- 10             w2 sleeps
- 10             w0 starts and burns CPU
- 15             w0 sleeps
- 15             w1 wakes up and finishes
- 20             w2 wakes up and finishes
- 25             w0 wakes up and burns CPU
- 30             w0 finishes
-If q1 has WQ_CPU_INTENSIVE set,
 TIME IN MSECS  EVENT
 0              w0 starts and burns CPU
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 7c3a8801b7ce..9efceff51bfb 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -54,6 +54,9 @@ Protocol 2.10:	(Kernel 2.6.31) Added a protocol for relaxed alignment
                beyond the kernel_alignment added, new init_size and
                pref_address fields.  Added extended boot loader IDs.
+Protocol 2.11:  (Kernel 3.6) Added a field for offset of EFI handover
+                protocol entry point.
 **** MEMORY LAYOUT
 The traditional memory map for the kernel loader, used for Image or
@@ -189,6 +192,7 @@ Offset	Proto	Name		Meaning
                                of struct setup_data
 0258/8  2.10+   pref_address    Preferred loading address
 0260/4  2.10+   init_size       Linear memory required during initialization
+0264/4  2.11+   handover_offset Offset of handover entry point
 (1) For backwards compatibility, if the setup_sects field contains 0, the
    real value is 4.
@@ -363,7 +367,8 @@ Protocol:	2.00+
  ext_loader_type <- 0x05
  ext_loader_ver  <- 0x23
-  Assigned boot loader ids:
+  Assigned boot loader ids (hexadecimal):
        0  LILO                 (0x00 reserved for pre-2.00 bootloader)
        1  Loadlin
        2  bootsect-loader      (0x20, all other values reserved)
@@ -378,6 +383,8 @@ Protocol:	2.00+
        C  Arcturus Networks uCbootloader
        E  Extended             (see ext_loader_type)
        F  Special              (0xFF = undefined)
+       10  Reserved
+       11  Minimal Linux Bootloader <http://sebastian-plotz.blogspot.de>
  Please contact <hpa@zytor.com> if you need a bootloader ID
  value assigned.
@@ -690,6 +697,16 @@ Offset/size:	0x260/4
  else
        runtime_start = pref_address
+Field name:     handover_offset
+Type:           read
+Offset/size:    0x264/4
+  This field is the offset from the beginning of the kernel image to
+  the EFI handover protocol entry point. Boot loaders using the EFI
+  handover protocol to boot the kernel should jump to this offset.
+  See EFI HANDOVER PROTOCOL below for more details.
 **** THE IMAGE CHECKSUM
@@ -1010,3 +1027,30 @@ segment; __BOOS_CS must have execute/read permission, and __BOOT_DS
 must have read/write permission; CS must be __BOOT_CS and DS, ES, SS
 must be __BOOT_DS; interrupt must be disabled; %esi must hold the base
 address of the struct boot_params; %ebp, %edi and %ebx must be zero.
+**** EFI HANDOVER PROTOCOL
+This protocol allows boot loaders to defer initialisation to the EFI
+boot stub. The boot loader is required to load the kernel/initrd(s)
+from the boot media and jump to the EFI handover protocol entry point
+which is hdr->handover_offset bytes from the beginning of
+startup_{32,64}.
+The function prototype for the handover entry point looks like this,
+    efi_main(void *handle, efi_system_table_t *table, struct boot_params *bp)
+'handle' is the EFI image handle passed to the boot loader by the EFI
+firmware, 'table' is the EFI system table - these are the first two
+arguments of the "handoff state" as described in section 2.3 of the
+UEFI specification. 'bp' is the boot loader-allocated boot params.
+The boot loader *must* fill out the following fields in bp,
+    o hdr.code32_start
+    o hdr.cmd_line_ptr
+    o hdr.cmdline_size
+    o hdr.ramdisk_image (if applicable)
+    o hdr.ramdisk_size  (if applicable)
+All other fields should be zero.
author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-08-06 12:48:31 -0400
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2012-08-06 12:48:31 -0400
commit	c87985a3ce723995fc7b25e598238d67154108a1 (patch)
tree	e60def1b77c25c1d74180f62e8a5603f9826f209 /Documentation
parent	d155255a344c417acad74156654295a2964e6b81 (diff)
parent	0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)