Greg Kroah-Hartman b91867f2ee 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>		2012-02-10 10:58:25 -08:00
..
as102	[media] drivers/staging/media/as102/as102_usb_drv.c: shift position of allocation code	2012-01-06 11:14:30 -02:00
cxd2099	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
dt3155v4l	[media] Staging: dt3155v4l: probe() always fails	2012-01-06 11:06:53 -02:00
easycap	staging, media, easycap: Fix mem leak in easycap_usb_probe()	2012-02-09 09:51:47 -08:00
go7007	staging: fix go7007-usb license	2012-02-01 18:29:33 -08:00
lirc	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-01-15 12:49:56 -08:00
solo6x10	Merge tag 'v3.2-rc2' into staging/for_v3.3	2011-11-23 19:42:09 -02:00
Kconfig	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00
Makefile	staging: Move media drivers to staging/media	2011-11-03 07:59:03 -02:00