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
..
mdp4	Linux 4.0-rc3	2015-03-09 19:58:30 +10:00
mdp5	Linux 4.0-rc3	2015-03-09 19:58:30 +10:00
mdp_common.xml.h	drm/msm: update generated headers	2015-02-01 15:30:33 -05:00
mdp_format.c	drm/msm/mdp: add common YUV information for MDP4/MDP5	2015-02-01 15:30:34 -05:00
mdp_kms.c	drm/msm: Do not BUG_ON(!spin_is_locked()) on UP	2015-02-01 15:30:25 -05:00
mdp_kms.h	drm/msm/mdp: add common YUV information for MDP4/MDP5	2015-02-01 15:30:34 -05:00