Greg Kroah-Hartman 829455bb0e Merge 3.10-rc3 into staging-next ... We want the changes here, and we resolve the merge conflict that was happening in the nvec_kbd.c file. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-05-27 10:54:33 +09:00
..
ipu-v3	ARM: arm-soc platform updates for 3.10, part 3	2013-05-07 11:02:18 -07:00
imx-drm-core.c	staging: drm/imx: Add support for VGA via TVE on i.MX53	2013-04-09 16:16:16 -07:00
imx-drm.h	staging: drm/imx: Add support for VGA via TVE on i.MX53	2013-04-09 16:16:16 -07:00
imx-fb.c
imx-fbdev.c
imx-tve.c	Merge 3.10-rc3 into staging-next	2013-05-27 10:54:33 +09:00
ipuv3-crtc.c	staging: drm/imx: Add support for VGA via TVE on i.MX53	2013-04-09 16:16:16 -07:00
Kconfig	staging: video: imx: Select VIDEOMODE_HELPERS for parallel display	2013-05-21 10:48:54 -07:00
Makefile	staging: drm/imx: Add support for Television Encoder (TVEv2)	2013-04-09 16:16:17 -07:00
parallel-display.c	imx-drm: parallel-display: Let device core handle pinctrl	2013-05-21 10:44:51 -07:00
TODO	staging: drm/imx: update TODO file	2013-04-11 12:56:10 -07:00