Merge tag 'staging-3.3-rc3' into staging-next

This was done to resolve some merge issues with the following files that
had changed in both branches:
	drivers/staging/rtl8712/rtl871x_sta_mgt.c
	drivers/staging/tidspbridge/rmgr/drv_interface.c
	drivers/staging/zcache/zcache-main.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/android/Kconfig
index fef3580,75ca225..f3b7c75
--- 1/drivers/staging/android/Kconfig
--- 2/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@@ -100,8 -99,38 +100,34 @@@ config ANDROID_LOW_MEMORY_KILLE
        ---help---
          Register processes to be killed when memory is low
  
 -config ANDROID_PMEM
 -      bool "Android pmem allocator"
 -      depends on ARM
 -
  source "drivers/staging/android/switch/Kconfig"
  
+ config ANDROID_INTF_ALARM
+       bool "Android alarm driver"
+       depends on RTC_CLASS
+       default n
+       help
+         Provides non-wakeup and rtc backed wakeup alarms based on rtc or
+         elapsed realtime, and a non-wakeup alarm on the monotonic clock.
+         Also provides an interface to set the wall time which must be used
+         for elapsed realtime to work.
+ 
+ config ANDROID_INTF_ALARM_DEV
+       bool "Android alarm device"
+       depends on ANDROID_INTF_ALARM
+       default y
+       help
+         Exports the alarm interface to user-space.
+ 
+ config ANDROID_ALARM_OLDDRV_COMPAT
+       bool "Android Alarm compatability with old drivers"
+       depends on ANDROID_INTF_ALARM
+       default n
+       help
+         Provides preprocessor alias to aid compatability with
+         older out-of-tree drivers that use the Android Alarm
+         in-kernel API. This will be removed eventually.
+ 
  endif # if ANDROID
  
  endmenu

diff --cc drivers/staging/android/Makefile
index 5fcc24f,7c6e53b..785f269
--- 1/drivers/staging/android/Makefile
--- 2/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@@ -5,4 -5,7 +5,6 @@@ obj-$(CONFIG_ANDROID_RAM_CONSOLE)        += ra
  obj-$(CONFIG_ANDROID_TIMED_OUTPUT)    += timed_output.o
  obj-$(CONFIG_ANDROID_TIMED_GPIO)      += timed_gpio.o
  obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)       += lowmemorykiller.o
 -obj-$(CONFIG_ANDROID_PMEM)            += pmem.o
  obj-$(CONFIG_ANDROID_SWITCH)          += switch/
+ obj-$(CONFIG_ANDROID_INTF_ALARM)      += alarm.o
+ obj-$(CONFIG_ANDROID_INTF_ALARM_DEV)  += alarm-dev.o

diff --cc drivers/staging/android/binder.c
Simple merge

diff --cc drivers/staging/android/lowmemorykiller.c
index efc7dc1,ae38c39..8b8a537
--- 1/drivers/staging/android/lowmemorykiller.c
--- 2/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@@ -180,10 -178,9 +180,10 @@@ static int lowmem_shrink(struct shrinke
                 */
  #ifdef CONFIG_PROFILING
                lowmem_deathpending = selected;
 +              lowmem_deathpending_timeout = jiffies + HZ;
                task_handoff_register(&task_nb);
  #endif
-               force_sig(SIGKILL, selected);
+               send_sig(SIGKILL, selected, 0);
                rem -= selected_tasksize;
        }
        lowmem_print(4, "lowmem_shrink %lu, %x, return %d\n",

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

diff --cc drivers/staging/rtl8712/os_intfs.c
Simple merge

diff --cc drivers/staging/rtl8712/usb_intf.c
Simple merge

diff --cc drivers/staging/tidspbridge/core/tiomap3430.c
Simple merge

diff --cc drivers/staging/tidspbridge/rmgr/drv_interface.c
index 385740b,31b5140..c14fa8e
--- 1/drivers/staging/tidspbridge/rmgr/drv_interface.c
--- 2/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@@ -405,14 -540,10 +540,13 @@@ static int __devexit omap34_xx_bridge_r
  
        if (driver_context) {
                /* Put the DSP in reset state */
-               ret = dsp_deinit(driver_context);
+               dsp_deinit(driver_context);
                driver_context = 0;
-               DBC_ASSERT(ret == true);
        }
  
 +      kfree(drv_datap);
 +      dev_set_drvdata(bridge, NULL);
 +
  func_cont:
        mem_ext_phys_pool_release();
  

diff --cc drivers/staging/zcache/zcache-main.c
Simple merge