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
..
Kconfig
Makefile	staging: drm/omap: add drm_plane support	2012-02-08 14:14:11 -08:00
omap_connector.c
omap_crtc.c	staging: drm/omap: updates for DSS fifomerge API changes	2012-02-08 14:14:11 -08:00
omap_debugfs.c	staging: drm/omap: add debugfs support	2011-12-16 10:59:26 -08:00
omap_dmm_priv.h	staging: drm/omap: DMM based hardware scrolling console	2011-12-12 16:37:53 -08:00
omap_dmm_tiler.c	staging: drm/omap: add debugfs support	2011-12-16 10:59:26 -08:00
omap_dmm_tiler.h	staging: drm/omap: add debugfs support	2011-12-16 10:59:26 -08:00
omap_drm.h
omap_drv.c	staging: drm/omap: fix minimum width/height	2012-02-08 14:14:12 -08:00
omap_drv.h	staging: drm/omap: updates for DSS fifomerge API changes	2012-02-08 14:14:11 -08:00
omap_encoder.c	staging: drm/omap: crtc/encoder/fb destroy cleanups	2011-12-12 16:37:52 -08:00
omap_fb.c	staging: drm/omap: multiplanar and YUV support	2012-02-08 14:14:11 -08:00
omap_fbdev.c	drivers/staging/omapdrm/omap_fbdev.c: move free after uses	2012-02-08 14:14:12 -08:00
omap_gem_helpers.c	staging: drm/omap: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(..	2012-02-09 09:41:34 -08:00
omap_gem.c	staging: drm/omap: fix locking issue	2012-02-08 14:14:12 -08:00
omap_plane.c	staging: drm/omap: updates for DSS fifomerge API changes	2012-02-08 14:14:11 -08:00
omap_priv.h	staging: drm/omap: add drm_plane support	2012-02-08 14:14:11 -08:00
tcm-sita.c
tcm-sita.h
tcm.h
TODO	drm/omap: add GEM support for tiled/dmm buffers	2011-12-08 15:04:21 -08:00