From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 10 Feb 2012 18:58:25 +0000 (-0800)
Subject: Merge tag 'staging-3.3-rc3' into staging-next
X-Git-Tag: v3.4-rc1~186^2~176
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b91867f2ee5c84b550f95ce54c91b180f70f48cb;p=pandora-kernel.git

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

b91867f2ee5c84b550f95ce54c91b180f70f48cb
Reading git-diff-tree failed