Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ...

This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-09-16 17:17:25 -07:00

..

Kconfig

staging: add omapdrm DRM/KMS driver for TI OMAP platforms

2011-11-26 17:43:30 -08:00

Makefile

staging: drm/omap: dmabuf/prime support

2012-04-10 11:25:59 -07:00

omap_connector.c

drm/omap: add more new timings fields

2012-09-10 16:04:21 -07:00

omap_crtc.c

staging: drm/omap: hold a ref to the bo while waiting for flip

2012-09-10 16:44:22 -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: omapdrm: Fix error paths during dmm init

2012-06-11 08:43:19 -07:00

omap_dmm_tiler.c

staging: drm/omap: add rotation properties

2012-08-15 15:22:42 -07:00

omap_dmm_tiler.h

staging: drm/omap: add rotation properties

2012-08-15 15:22:42 -07:00

omap_drm.h

drm/omap: DMM/TILER support for OMAP4+ platform

2011-12-08 15:03:54 -08:00

omap_drv.c

staging: omapdrm: use alloc_ordered_workqueue() instead of UNBOUND w/ max_active = 1

2012-09-04 12:18:10 -07:00

omap_drv.h

staging: omapdrm: Expose the OMAP Z-Order property through DRM

2012-08-15 15:25:15 -07:00

omap_encoder.c

drm: Make the .mode_fixup() operations mode argument a const pointer

2012-07-19 21:52:38 -04:00

omap_fb.c

staging: drm/omap: add rotation properties

2012-08-15 15:22:42 -07:00

omap_fbdev.c

staging: omapdrm: fix crash when freeing bad fb

2012-06-11 08:42:09 -07:00

omap_gem_dmabuf.c

staging: drm/omap: initial dmabuf/prime import support

2012-05-17 08:54:09 -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: Add error handling

2012-09-04 12:18:10 -07:00

omap_plane.c

staging: omapdrm: Expose the OMAP Z-Order property through DRM

2012-08-15 15:25:15 -07:00

tcm-sita.c

staging:omapdrm Fix typos in drivers:omapdrm

2012-04-10 10:31:01 -07:00

tcm-sita.h

drm/omap: DMM/TILER support for OMAP4+ platform

2011-12-08 15:03:54 -08:00

tcm.h

drm/omap: DMM/TILER support for OMAP4+ platform

2011-12-08 15:03:54 -08:00

TODO

staging: drm/omap: update TODO

2012-07-06 16:11:44 -07:00