Greg Kroah-Hartman caf382fe31 Merge 3.17-rc5 into staging-next. ... This fixes a merge conflict in lustre, and we want the other fixes that went into 3.17-rc5 as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-09-14 19:33:47 -07:00
..
imx-drm-core.c	staging: imx-drm: fix a blank line coding style issue	2014-08-16 12:23:12 -07:00
imx-drm.h	drm: make mode_valid callback optional	2014-04-22 11:18:12 +02:00
imx-hdmi.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-06-12 11:32:30 -07:00
imx-hdmi.h
imx-ldb.c	imx-drm: imx-ldb: fix NULL pointer in imx_ldb_unbind()	2014-09-08 12:10:28 -07:00
imx-tve.c	staging: imx-drm: fix a blank line coding style issue	2014-08-16 12:23:12 -07:00
ipuv3-crtc.c	staging: imx-drm: Lines over 80 characters fixed.	2014-08-30 14:06:48 -07:00
ipuv3-plane.c	Merge 3.17-rc5 into staging-next.	2014-09-14 19:33:47 -07:00
ipuv3-plane.h
Kconfig	gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging	2014-06-04 11:06:52 +02:00
Makefile	gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging	2014-06-04 11:06:52 +02:00
parallel-display.c	staging: imx-drm: fix a blank line coding style issue	2014-08-16 12:23:12 -07:00
TODO	staging: imx-drm: Update TODO	2014-03-07 16:18:01 +00:00