Staging: Merge 2.6.37-rc5 into staging-next

This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/staging/asus_oled/asus_oled.c
Simple merge

diff --cc drivers/staging/batman-adv/hard-interface.c
index 4f95777ce0803d79cdbcb285b92efcb77b77fb53,d85de82f941a4a8b302b5c4dd02eea8b0de79bcc..c3c7b7ac0946e90c3f6f7bb7cc75c896c22a678a
--- 1/drivers/staging/batman-adv/hard-interface.c
--- 2/drivers/staging/batman-adv/hard-interface.c
+++ b/drivers/staging/batman-adv/hard-interface.c
@@@ -469,8 -463,9 +469,9 @@@ static void hardif_remove_interface(str
                return;
  
        batman_if->if_status = IF_TO_BE_REMOVED;
+       synchronize_rcu();
        sysfs_del_hardif(&batman_if->hardif_obj);
 -      hardif_put(batman_if);
 +      call_rcu(&batman_if->rcu, hardif_free_rcu);
  }
  
  void hardif_remove_interfaces(void)

diff --cc drivers/staging/comedi/drivers/usbdux.c
Simple merge

diff --cc drivers/staging/easycap/easycap.h
Simple merge

diff --cc drivers/staging/go7007/go7007-driver.c
Simple merge

diff --cc drivers/staging/hv/storvsc_drv.c
Simple merge

diff --cc drivers/staging/intel_sst/intel_sst_app_interface.c
index ce2c755a1766fc40a56408f300feb5cf82b68af8,991440015e9263e415a9449eb9fa7f34dae07f41..a367991d56008e79a0fa2cbca20dcd5594ab1544
--- 1/drivers/staging/intel_sst/intel_sst_app_interface.c
--- 2/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_app_interface.c
@@@ -35,9 -33,7 +35,8 @@@
  #include <linux/aio.h>
  #include <linux/uaccess.h>
  #include <linux/firmware.h>
 +#include <linux/pm_runtime.h>
  #include <linux/ioctl.h>
- #include <linux/smp_lock.h>
  #ifdef CONFIG_MRST_RAR_HANDLER
  #include <linux/rar_register.h>
  #include "../../../drivers/staging/memrar/memrar.h"

diff --cc drivers/staging/intel_sst/intel_sst_stream_encoded.c
Simple merge

diff --cc drivers/staging/rt2860/usb_main_dev.c
Simple merge

diff --cc drivers/staging/rtl8712/osdep_service.h
Simple merge

diff --cc drivers/staging/spectra/ffsport.c
Simple merge

diff --cc drivers/staging/udlfb/udlfb.c
Simple merge