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 | ||
sun4i_backend.c | ||
sun4i_backend.h | ||
sun4i_crtc.c | ||
sun4i_crtc.h | ||
sun4i_dotclock.c | ||
sun4i_dotclock.h | ||
sun4i_drv.c | ||
sun4i_drv.h | ||
sun4i_framebuffer.c | ||
sun4i_framebuffer.h | ||
sun4i_frontend.c | ||
sun4i_frontend.h | ||
sun4i_hdmi_ddc_clk.c | ||
sun4i_hdmi_enc.c | ||
sun4i_hdmi_i2c.c | ||
sun4i_hdmi_tmds_clk.c | ||
sun4i_hdmi.h | ||
sun4i_layer.c | ||
sun4i_layer.h | ||
sun4i_lvds.c | ||
sun4i_lvds.h | ||
sun4i_rgb.c | ||
sun4i_rgb.h | ||
sun4i_tcon.c | ||
sun4i_tcon.h | ||
sun4i_tv.c | ||
sun6i_drc.c | ||
sun6i_mipi_dsi.c | ||
sun6i_mipi_dsi.h | ||
sun8i_csc.c | ||
sun8i_csc.h | ||
sun8i_dw_hdmi.c | ||
sun8i_dw_hdmi.h | ||
sun8i_hdmi_phy_clk.c | ||
sun8i_hdmi_phy.c | ||
sun8i_mixer.c | ||
sun8i_mixer.h | ||
sun8i_tcon_top.c | ||
sun8i_tcon_top.h | ||
sun8i_ui_layer.c | ||
sun8i_ui_layer.h | ||
sun8i_ui_scaler.c | ||
sun8i_ui_scaler.h | ||
sun8i_vi_layer.c | ||
sun8i_vi_layer.h | ||
sun8i_vi_scaler.c | ||
sun8i_vi_scaler.h | ||
sunxi_engine.h |