forked from Minki/linux
41206a073c
-----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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
rcar_cmm.c | ||
rcar_cmm.h | ||
rcar_du_crtc.c | ||
rcar_du_crtc.h | ||
rcar_du_drv.c | ||
rcar_du_drv.h | ||
rcar_du_encoder.c | ||
rcar_du_encoder.h | ||
rcar_du_group.c | ||
rcar_du_group.h | ||
rcar_du_kms.c | ||
rcar_du_kms.h | ||
rcar_du_of_lvds_r8a7790.dts | ||
rcar_du_of_lvds_r8a7791.dts | ||
rcar_du_of_lvds_r8a7793.dts | ||
rcar_du_of_lvds_r8a7795.dts | ||
rcar_du_of_lvds_r8a7796.dts | ||
rcar_du_of.c | ||
rcar_du_of.h | ||
rcar_du_plane.c | ||
rcar_du_plane.h | ||
rcar_du_regs.h | ||
rcar_du_vsp.c | ||
rcar_du_vsp.h | ||
rcar_du_writeback.c | ||
rcar_du_writeback.h | ||
rcar_dw_hdmi.c | ||
rcar_lvds_regs.h | ||
rcar_lvds.c | ||
rcar_lvds.h |