forked from Minki/linux
a8c6ecb3be
-----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 |
||
---|---|---|
.. | ||
dc.c | ||
dc.h | ||
dpaux.c | ||
dpaux.h | ||
drm.c | ||
drm.h | ||
dsi.c | ||
dsi.h | ||
fb.c | ||
gem.c | ||
gem.h | ||
gr2d.c | ||
gr2d.h | ||
gr3d.c | ||
gr3d.h | ||
hdmi.c | ||
hdmi.h | ||
Kconfig | ||
Makefile | ||
mipi-phy.c | ||
mipi-phy.h | ||
output.c | ||
rgb.c | ||
sor.c | ||
sor.h |