Greg Kroah-Hartman 7ca363f687 Merge branch 'staging-linus' into staging-work ... This is to pull in the lustre fixes so that others can continue to work on updating the lustre codebase, as well as resolve some merge issues with the ion and ocproto drivers to keep linux-next happy. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-02-08 13:38:28 -08:00
..
ipu-v3	Merge 3.13-rc5 into staging-next	2013-12-24 10:06:37 -08:00
imx-drm-core.c	imx-drm: imx-drm-core: merge imx_drm_crtc_register() into imx_drm_add_crtc()	2014-02-05 11:59:50 -08:00
imx-drm.h	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00
imx-fb.c
imx-fbdev.c
imx-hdmi.c	Merge branch 'staging-linus' into staging-work	2014-02-08 13:38:28 -08:00
imx-hdmi.h	imx-drm: Add mx6 hdmi transmitter support	2013-12-08 17:23:18 -08:00
imx-ldb.c	staging: imx-drm: remove unnecessary braces	2013-11-10 08:07:20 -08:00
imx-tve.c	staging: imx-drm: imx-tve: Fix a sparse warning	2014-01-08 15:40:47 -08:00
ipuv3-crtc.c	staging: drm/imx: don't drop crtc offsets when doing pageflip	2014-01-13 15:11:51 -08:00
ipuv3-plane.c	staging: drm/imx: don't drop crtc offsets when doing pageflip	2014-01-13 15:11:51 -08:00
ipuv3-plane.h	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00
Kconfig	imx-drm: Add mx6 hdmi transmitter support	2013-12-08 17:23:18 -08:00
Makefile	imx-drm: Add mx6 hdmi transmitter support	2013-12-08 17:23:18 -08:00
parallel-display.c	imx-drm: parallel-display: honor 'native-mode' property when selecting video mode from DT	2014-01-13 15:14:43 -08:00
TODO	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00