From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 7 Dec 2010 18:47:56 +0000 (-0800)
Subject: Staging: Merge 2.6.37-rc5 into staging-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea3398a1ae54cd3403f3cc0f6aa498c7452c681a;p=linux-beck.git

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>
---

ea3398a1ae54cd3403f3cc0f6aa498c7452c681a
diff --cc drivers/staging/batman-adv/hard-interface.c
index 4f95777ce080,d85de82f941a..c3c7b7ac0946
--- a/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/intel_sst/intel_sst_app_interface.c
index ce2c755a1766,991440015e92..a367991d5600
--- a/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"