Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree update from Greg KH:
 "Here's the large staging tree merge for 3.11-rc1

  Huge thing here is the Lustre client code.  Unfortunatly, due to it
  not building properly on a wide variety of different architectures
  (this was production code???), it is currently disabled from the build
  so as to not annoy people.

  Other than Lustre, there are loads of comedi patches, working to clean
  up that subsystem, iio updates and new drivers, and a load of cleanups
  from the OPW applicants in their quest to get a summer internship.

  All of these have been in the linux-next releases for a while (hence
  the Lustre code being disabled)"

Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due
to independent renamings in the staging driver cleanup and the USB
tree..

* tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits)
  Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
  staging: rtl8192u: fix line length in r819xU_phy.h
  staging: rtl8192u: rename variables in r819xU_phy.h
  staging: rtl8192u: fix comments in r819xU_phy.h
  staging: rtl8192u: fix whitespace in r819xU_phy.h
  staging: rtl8192u: fix newlines in r819xU_phy.c
  staging: comedi: unioxx5: use comedi_alloc_spriv()
  staging: comedi: unioxx5: fix unioxx5_detach()
  silicom: checkpatch: errors caused by macros
  Staging: silicom: remove the board_t typedef in bpctl_mod.c
  Staging: silicom: capitalize labels in the bp_media_type enum
  Staging: silicom: remove bp_media_type enum typedef
  staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c
  staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
  staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c
  staging: rtl8192u: limit line size in r819xU_phy.c
  zram: allow request end to coincide with disksize
  staging: drm/imx: use generic irq chip unused field to block out invalid irqs
  staging: drm/imx: use generic irqchip
  staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers
  ...

1 files changed, 45 insertions, 45 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 2e33dc6b2346..dda81ffae5cf 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -690,45 +690,45 @@ Description:
                 Actually start the buffer capture up.  Will start trigger
                 if first device and appropriate.
 
-What:           /sys/bus/iio/devices/iio:deviceX/buffer/scan_elements
+What:           /sys/bus/iio/devices/iio:deviceX/scan_elements
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Directory containing interfaces for elements that will be
                 captured for a single triggered sample set in the buffer.
 
-What:           /sys/.../buffer/scan_elements/in_accel_x_en
-What:           /sys/.../buffer/scan_elements/in_accel_y_en
-What:           /sys/.../buffer/scan_elements/in_accel_z_en
-What:           /sys/.../buffer/scan_elements/in_anglvel_x_en
-What:           /sys/.../buffer/scan_elements/in_anglvel_y_en
-What:           /sys/.../buffer/scan_elements/in_anglvel_z_en
-What:           /sys/.../buffer/scan_elements/in_magn_x_en
-What:           /sys/.../buffer/scan_elements/in_magn_y_en
-What:           /sys/.../buffer/scan_elements/in_magn_z_en
-What:           /sys/.../buffer/scan_elements/in_timestamp_en
-What:           /sys/.../buffer/scan_elements/in_voltageY_supply_en
-What:           /sys/.../buffer/scan_elements/in_voltageY_en
-What:           /sys/.../buffer/scan_elements/in_voltageY-voltageZ_en
-What:           /sys/.../buffer/scan_elements/in_incli_x_en
-What:           /sys/.../buffer/scan_elements/in_incli_y_en
-What:           /sys/.../buffer/scan_elements/in_pressureY_en
-What:           /sys/.../buffer/scan_elements/in_pressure_en
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_x_en
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_y_en
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_z_en
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_x_en
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_y_en
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_z_en
+What:           /sys/.../iio:deviceX/scan_elements/in_timestamp_en
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_en
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
+What:           /sys/.../iio:deviceX/scan_elements/in_incli_x_en
+What:           /sys/.../iio:deviceX/scan_elements/in_incli_y_en
+What:           /sys/.../iio:deviceX/scan_elements/in_pressureY_en
+What:           /sys/.../iio:deviceX/scan_elements/in_pressure_en
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 Scan element control for triggered data capture.
 
-What:           /sys/.../buffer/scan_elements/in_accel_type
-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_type
-What:           /sys/.../buffer/scan_elements/in_voltageY_supply_type
-What:           /sys/.../buffer/scan_elements/in_timestamp_type
-What:           /sys/.../buffer/scan_elements/in_pressureY_type
-What:           /sys/.../buffer/scan_elements/in_pressure_type
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_type
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_type
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_type
+What:           /sys/.../iio:deviceX/scan_elements/in_incli_type
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_type
+What:           /sys/.../iio:deviceX/scan_elements/in_voltage_type
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
+What:           /sys/.../iio:deviceX/scan_elements/in_timestamp_type
+What:           /sys/.../iio:deviceX/scan_elements/in_pressureY_type
+What:           /sys/.../iio:deviceX/scan_elements/in_pressure_type
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
@@ -752,29 +752,29 @@ Description:
                 For other storage combinations this attribute will be extended
                 appropriately.
 
-What:           /sys/.../buffer/scan_elements/in_accel_type_available
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_type_available
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description:
                 If the type parameter can take one of a small set of values,
                 this attribute lists them.
 
-What:           /sys/.../buffer/scan_elements/in_voltageY_index
-What:           /sys/.../buffer/scan_elements/in_voltageY_supply_index
-What:           /sys/.../buffer/scan_elements/in_accel_x_index
-What:           /sys/.../buffer/scan_elements/in_accel_y_index
-What:           /sys/.../buffer/scan_elements/in_accel_z_index
-What:           /sys/.../buffer/scan_elements/in_anglvel_x_index
-What:           /sys/.../buffer/scan_elements/in_anglvel_y_index
-What:           /sys/.../buffer/scan_elements/in_anglvel_z_index
-What:           /sys/.../buffer/scan_elements/in_magn_x_index
-What:           /sys/.../buffer/scan_elements/in_magn_y_index
-What:           /sys/.../buffer/scan_elements/in_magn_z_index
-What:           /sys/.../buffer/scan_elements/in_incli_x_index
-What:           /sys/.../buffer/scan_elements/in_incli_y_index
-What:           /sys/.../buffer/scan_elements/in_timestamp_index
-What:           /sys/.../buffer/scan_elements/in_pressureY_index
-What:           /sys/.../buffer/scan_elements/in_pressure_index
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_index
+What:           /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_x_index
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_y_index
+What:           /sys/.../iio:deviceX/scan_elements/in_accel_z_index
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
+What:           /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_x_index
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_y_index
+What:           /sys/.../iio:deviceX/scan_elements/in_magn_z_index
+What:           /sys/.../iio:deviceX/scan_elements/in_incli_x_index
+What:           /sys/.../iio:deviceX/scan_elements/in_incli_y_index
+What:           /sys/.../iio:deviceX/scan_elements/in_timestamp_index
+What:           /sys/.../iio:deviceX/scan_elements/in_pressureY_index
+What:           /sys/.../iio:deviceX/scan_elements/in_pressure_index
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
 Description: