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
..
Kconfig	Merge drm/drm-next into drm-misc-next	2019-10-03 16:38:50 +02:00
Makefile	drm/hisilicon/hibmc: Switch to generic fbdev emulation	2020-01-06 13:45:38 +01:00
hibmc_drm_de.c	drm/hisilicon: Enforce 128-byte stride alignment to fix the hardware limitation	2020-04-03 01:56:31 +00:00
hibmc_drm_drv.c	Linux 5.8-rc6	2020-07-24 08:48:05 +10:00
hibmc_drm_drv.h	drm/hisilicon: Code refactoring for hibmc_drv_vdac	2020-07-06 11:06:39 +02:00
hibmc_drm_regs.h	drm/hisilicon: Add new clock/resolution configurations	2020-02-27 04:34:31 +00:00
hibmc_drm_vdac.c	drm/hisilicon: Code refactoring for hibmc_drv_vdac	2020-07-06 11:06:39 +02:00
hibmc_ttm.c	drm/hisilicon: Enforce 128-byte stride alignment to fix the hardware limitation	2020-04-03 01:56:31 +00:00