Greg Kroah-Hartman 912cbd4952 Merge 3.13-rc5 into staging-next ... This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-12-24 10:06:37 -08:00
..
ipu-v3	Merge 3.13-rc5 into staging-next	2013-12-24 10:06:37 -08:00
imx-drm-core.c	Merge 3.13-rc5 into staging-next	2013-12-24 10:06:37 -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	imx-drm: Add mx6 hdmi transmitter support	2013-12-08 17:23:18 -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	imx-drm: imx-tve: don't call sleeping functions beneath enable_lock spinlock	2013-12-17 17:12:55 -08:00
ipuv3-crtc.c	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
ipuv3-plane.c	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07: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: Add MODULE_ALIAS()	2013-08-19 15:38:03 -07:00
TODO	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00