p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/gpu/drm/atmel-hlcdc
History
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
…
Makefile
…
atmel_hlcdc_crtc.c Linux 4.0-rc3 2015-03-09 19:58:30 +10:00
atmel_hlcdc_dc.c Linux 4.0-rc3 2015-03-09 19:58:30 +10:00
atmel_hlcdc_dc.h drm: atmel-hlcdc: add discard area support 2015-02-22 21:00:06 +01:00
atmel_hlcdc_layer.c Linux 4.0-rc3 2015-03-09 19:58:30 +10:00
atmel_hlcdc_layer.h drm: atmel-hlcdc: Atomic mode-setting conversion 2015-02-22 21:00:06 +01:00
atmel_hlcdc_output.c drm: atmel-hlcdc: Atomic mode-setting conversion 2015-02-22 21:00:06 +01:00
atmel_hlcdc_plane.c drm: Pass in new and old plane state to prepare_fb and cleanup_fb 2015-03-05 09:49:02 +10:00