Dave Airlie 41206a073c Linux 5.8-rc6 ... -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl8UzA4eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQ7cH/3v+Gv+SmHJCvaT2 CSu0+7okVnYbY3UTb3hykk7/aOqb6284KjxR03r0CWFzsEsZVhC5pvvruASSiMQg Pi04sLqv6CsGLHd1n+pl4AUYEaxq6k4KS3uU3HHSWxrahDDApQoRUx2F8lpOxyj8 RiwnoO60IMPA7IFJqzcZuFqsgdxqiiYvnzT461KX8Mrw6fyMXeR2KAj2NwMX8dZN At21Sf8+LSoh6q2HnugfiUd/jR10XbfxIIx2lXgIinb15GXgWydEQVrDJ7cUV7ix Jd0S+dtOtp+lWtFHDoyjjqqsMV7+G8i/rFNZoxSkyZqsUTaKzaR6JD3moSyoYZgG 0+eXO4A= =9EpR -----END PGP SIGNATURE----- Merge v5.8-rc6 into drm-next I've got a silent conflict + two trees based on fixes to merge. Fixes a silent merge with amdgpu Signed-off-by: Dave Airlie <airlied@redhat.com>		2020-07-24 08:48:05 +10:00
..
acp	drm: amd/acp: fix broken menu structure	2020-03-13 11:52:35 -04:00
amdgpu	Linux 5.8-rc6	2020-07-24 08:48:05 +10:00
amdkfd	drm/amd/amdkfd: Fix large framesize for kfd_smi_ev_read()	2020-07-15 13:27:34 -04:00
display	Linux 5.8-rc6	2020-07-24 08:48:05 +10:00
include	drm/amdgpu/atomfirmware: update to latest integratedinfotable	2020-07-02 12:02:57 -04:00
powerplay	drm/amd/powerplay: set VCN1 pg only for sienna_cichlid	2020-07-15 13:27:34 -04:00