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
..
mdp5.xml.h	drm/msm: update generated headers (add 6th lm.base entry)	2015-03-04 18:23:39 -05:00
mdp5_cfg.c	drm/msm/mdp5: don't use void * for opaque types	2014-11-21 08:57:20 -05:00
mdp5_cfg.h	drm/msm/mdp5: don't use void * for opaque types	2014-11-21 08:57:20 -05:00
mdp5_crtc.c	drm/msm/mdp5: fix cursor blending	2015-03-04 18:23:40 -05:00
mdp5_ctl.c	drm/msm/mdp5: fix parameter type for mdp5_ctl_set_intf()	2015-02-01 15:32:44 -05:00
mdp5_ctl.h	drm/msm/mdp5: fix parameter type for mdp5_ctl_set_intf()	2015-02-01 15:32:44 -05:00
mdp5_encoder.c	drm/msm/mdp5: fixup "drm/msm: fix fallout of atomic dpms changes"	2015-03-04 18:23:38 -05:00
mdp5_irq.c	drm/msm: kexec fixes	2015-03-04 18:23:41 -05:00
mdp5_kms.c	drm/msm: Add the eDP connector in msm drm driver (V2)	2015-02-01 15:32:43 -05:00
mdp5_kms.h	drm/msm/mdp: add common YUV information for MDP4/MDP5	2015-02-01 15:30:34 -05:00
mdp5_plane.c	drm: Pass in new and old plane state to prepare_fb and cleanup_fb	2015-03-05 09:49:02 +10:00
mdp5_smp.c	drm/msm/mdp5: Fix negative SMP block allocation	2015-02-01 15:32:47 -05:00
mdp5_smp.h	drm/msm/mdp5: don't use void * for opaque types	2014-11-21 08:57:20 -05:00