Merge tag 'staging-3.3-rc3' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:58:25 +0000 (10:58 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 18:58:25 +0000 (10:58 -0800)
commitb91867f2ee5c84b550f95ce54c91b180f70f48cb
treebd7a5be4484d539af13e6b345320455e989612cf
parentb05ee6bf9e6c7acc38dca1466b63bb24ae5df6f3
parent9196dc1129fbb3ecf93027224a6bdbc86d086e3a
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>
12 files changed:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/binder.c
drivers/staging/android/lowmemorykiller.c
drivers/staging/rtl8712/drv_types.h
drivers/staging/rtl8712/os_intfs.c
drivers/staging/rtl8712/usb_intf.c
drivers/staging/tidspbridge/core/tiomap3430.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/staging/zcache/zcache-main.c