Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
Kconfig
Makefile	staging: drm/omap: dmabuf/prime support	2012-04-10 11:25:59 -07:00
omap_connector.c
omap_crtc.c	staging: drm/omap: use current time for page-flip event	2012-03-13 15:44:44 -07:00
omap_debugfs.c	staging: drm/omap: Disable DMM debugfs for OMAP3	2012-03-07 13:38:07 -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: omap/drm: dmm should return proper errors	2012-04-10 09:46:30 -07:00
omap_dmm_tiler.h	staging: drm/omap: Get DMM resources from hwmod	2012-03-07 13:38:08 -08:00
omap_drm.h
omap_drv.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
omap_drv.h	staging: drm/omap: dmabuf/prime support	2012-04-10 11:25:59 -07:00
omap_encoder.c	staging: drm/omap: crtc/encoder/fb destroy cleanups	2011-12-12 16:37:52 -08:00
omap_fb.c	staging:omapdrm Fix typos in drivers:omapdrm	2012-04-10 10:31:01 -07:00
omap_fbdev.c	staging: drm/omap: call omap_gem_roll() in non-atomic ctx	2012-03-07 13:38:07 -08:00
omap_gem_dmabuf.c	staging: drm/omap: dmabuf/prime support	2012-04-10 11:25:59 -07: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: dmabuf/prime support	2012-04-10 11:25:59 -07:00
omap_plane.c	staging: drm/omap: send page-flip event after endwin	2012-03-13 15:44:44 -07:00
omap_priv.h	staging: drm/omap: add drm_plane support	2012-02-08 14:14:11 -08:00
tcm-sita.c	staging:omapdrm Fix typos in drivers:omapdrm	2012-04-10 10:31:01 -07:00
tcm-sita.h
tcm.h
TODO	drm/omap: add GEM support for tiled/dmm buffers	2011-12-08 15:04:21 -08:00