Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next. ... This resolves the conflicts in the files: drivers/iio/adc/Kconfig drivers/staging/rtl8723au/os_dep/usb_ops_linux.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2014-05-22 23:27:17 +09:00
..
ipu-v3	Merge branch 'imx-drm-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next	2014-05-06 06:26:31 -07:00
imx-drm-core.c	imx-drm: imx-drm-core: Fix imx_drm_encoder_get_mux_id	2014-04-25 16:13:56 -07:00
imx-drm.h	Merge branch 'imx-drm-staging' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into staging-next	2014-03-07 14:23:34 -08:00
imx-hdmi.c	imx-drm: fix hdmi hotplug detection initial state	2014-04-25 16:13:56 -07: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: imx-ldb.c Fix line over 80 characters.	2014-03-18 11:36:58 -07:00
imx-tve.c	imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'	2014-04-26 11:23:38 +01:00
ipuv3-crtc.c	imx-drm: ipu-dc: disable DC module when not in use	2014-04-26 11:24:20 +01:00
ipuv3-plane.c	imx-drm: ipu-dp: split disabling the DP foreground channel from disabling the DP module	2014-04-26 11:24:17 +01:00
ipuv3-plane.h	staging: drm/imx: add drm plane support	2013-10-11 15:30:33 -07:00
Kconfig	imx-drm: parallel-display: Add drm_panel support	2014-02-27 12:43:36 -08:00
Makefile	imx-drm: remove imx-fb.c	2014-02-24 12:07:39 +00:00
parallel-display.c	staging: imx-drm: add LVDS666 support for parallel display	2014-04-25 16:11:03 -07:00
TODO	staging: imx-drm: Update TODO	2014-03-07 16:18:01 +00:00