Dave Airlie a8c6ecb3be Linux 4.0-rc3 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJU/NacAAoJEHm+PkMAQRiGdUcIAJU5dHclwd9HRc7LX5iOwYN6 mN0aCsYjMD8Pjx2VcPCgJvkIoESQO5pkwYpFFWCwILup1bVEidqXfr8EPOdThzdh kcaT0FwUvd19K+0jcKVNCX1RjKBtlUfUKONk6sS2x4RrYZpv0Ur8Gh+yXV8iMWtf fAusNEYlxQJvEz5+NSKw86EZTr4VVcykKLNvj+/t/JrXEuue7IG8EyoAO/nLmNd2 V/TUKKttqpE6aUVBiBDmcMQl2SUVAfp5e+KJAHmizdDpSE80nU59UC1uyV8VCYdM qwHXgttLhhKr8jBPOkvUxl4aSXW7S0QWO8TrMpNdEOeB3ZB8AKsiIuhe1JrK0ro= =Xkue -----END PGP SIGNATURE----- Merge tag 'v4.0-rc3' into drm-next Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get some mainline bug fixes needed for my testing box Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c		2015-03-09 19:58:30 +10:00
..
Kconfig	drm/tegra: Depend on COMMON_CLK	2014-11-13 16:10:27 +01:00
Makefile	drm/tegra: Remove host1x drm_bus implementation	2014-06-05 23:14:46 +02:00
dc.c	Linux 4.0-rc3	2015-03-09 19:58:30 +10:00
dc.h	drm/tegra: Implement more tiling modes	2014-08-04 10:07:34 +02:00
dpaux.c	drm/tegra: Renaming DP training vswing pre emph defines	2014-09-03 11:05:41 +02:00
dpaux.h	drm/tegra: dp: Support address-only I2C-over-AUX transactions	2014-04-08 16:12:36 +02:00
drm.c	drm/atomic-helper: Rename commmit_post/pre_planes	2015-02-24 01:57:46 +01:00
drm.h	drm/tegra: Track tiling and format in plane state	2015-01-27 10:14:57 +01:00
dsi.c	drm/tegra: dc: Unify enabling the display controller	2015-01-27 10:14:58 +01:00
dsi.h	drm/tegra: dsi: Implement host transfers	2014-11-13 16:12:36 +01:00
fb.c	drm/tegra: Move tegra_drm_mode_funcs to the core	2015-01-27 10:14:44 +01:00
gem.c	drm/tegra: gem: oops in error handling	2015-01-27 10:14:41 +01:00
gem.h	drm/tegra: gem: Use more consistent data types	2014-11-13 16:18:32 +01:00
gr2d.c	drm/tegra: add MODULE_DEVICE_TABLEs	2014-08-04 10:07:39 +02:00
gr2d.h	drm/tegra: Use symbolic names for gr2d registers	2013-10-31 09:55:44 +01:00
gr3d.c	ARM: SoC cleanups for 3.17	2014-08-08 11:00:26 -07:00
gr3d.h	drm/tegra: Add 3D support	2013-10-31 09:55:45 +01:00
hdmi.c	drm/tegra: hdmi: Explicitly set clock rate	2015-02-19 14:21:25 +01:00
hdmi.h	drm/tegra: hdmi - Disable LVDS mode	2014-06-05 23:09:25 +02:00
mipi-phy.c	drm/tegra: dsi: Adjust D-PHY timing	2015-01-27 10:14:40 +01:00
mipi-phy.h	drm/tegra: Relicense under GPL v2	2014-04-04 09:12:51 +02:00
output.c	drm/tegra: Atomic conversion, phase 1	2015-01-27 10:14:50 +01:00
rgb.c	drm/tegra: dc: Unify enabling the display controller	2015-01-27 10:14:58 +01:00
sor.c	drm/tegra: dc: Unify enabling the display controller	2015-01-27 10:14:58 +01:00
sor.h	drm/tegra: sor - Add CRC debugfs support	2014-06-05 23:09:17 +02:00