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

Pull staging driver updates from Greg KH:
 "Here's the big pull request for the staging driver tree for 3.17-rc1.

  Lots of things in here, over 2000 patches, but the best part is this:
   1480 files changed, 39070 insertions(+), 254659 deletions(-)

  Thanks to the great work of Kristina Martšenko, 14 different staging
  drivers have been removed from the tree as they were obsolete and no
  one was willing to work on cleaning them up.  Other than the driver
  removals, loads of cleanups are in here (comedi, lustre, etc.) as well
  as the usual IIO driver updates and additions.

  All of this has been in the linux-next tree for a while"

* tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits)
  staging: comedi: addi_apci_1564: remove diagnostic interrupt support code
  staging: comedi: addi_apci_1564: add subdevice to check diagnostic status
  staging: wlan-ng: coding style problem fix
  staging: wlan-ng: fixing coding style problems
  staging: comedi: ii_pci20kc: request and ioremap memory
  staging: lustre: bitwise vs logical typo
  staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h
  staging: dgnc: rephrase comment
  staging: comedi: ni_tio: remove some dead code
  staging: rtl8723au: Fix static symbol sparse warning
  staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc'
  staging: rtl8723au: Do not duplicate kernel provided USB macros
  staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown
  staging: rtl8723au: Remove two never set variables
  staging: rtl8723au: RSSI_test is never set
  staging:r8190: coding style: Fixed checkpatch reported Error
  staging:r8180: coding style: Fixed too long lines
  staging:r8180: coding style: Fixed commenting style
  staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer
  staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/mma8452.c
Simple merge

diff --cc drivers/iio/industrialio-buffer.c
Simple merge

diff --cc drivers/iio/industrialio-event.c
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc drivers/staging/android/sync.c
index c9a0c2cdc81a18cbc1a721ea4ae4e4687de6c9ab,cd7b8f59b9482d7bdc0d4404be6e6f4b36e11f92..e7b2e02341962426ea6e07a351d9932a01739f9d
--- 1/drivers/staging/android/sync.c
--- 2/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@@ -549,14 -677,17 +549,13 @@@ static unsigned int sync_fence_poll(str
  
        poll_wait(file, &fence->wq, wait);
  
 -      /*
 -       * Make sure that reads to fence->status are ordered with the
 -       * wait queue event triggering
 -       */
 -      smp_rmb();
 +      status = atomic_read(&fence->status);
  
 -      if (fence->status == 1)
 +      if (!status)
                return POLLIN;
 -      else if (fence->status < 0)
 +      else if (status < 0)
                return POLLERR;
-       else
-               return 0;
+       return 0;
  }
  
  static long sync_fence_ioctl_wait(struct sync_fence *fence, unsigned long arg)

diff --cc drivers/staging/vt6655/bssdb.c
Simple merge

diff --cc drivers/staging/vt6655/device_main.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc kernel/time/alarmtimer.c
Simple merge