mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
646db260b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJV/yX5AAoJEHm+PkMAQRiGUc4IAIFtSt2EORex45d2c64Varjm
4wVJM6k1xz0e8c5bI5D03y/WaefIC2LlKHtWw4+TytnwWEryuGQ1IitvDPZLIntk
I2tUN1IzyxZrJcG2GyfozjxSxeIcaL7us5j7555kEaRVWMamqDaQgVgEKFRqD43N
M4y8qRUeU3OiaL3OhQ9beSfpI/XqjaT+ECGO5HKC3NOJtTrD+cFqLAG9ScCPhvtk
YrrXx3K6J3mylvdvJ5W6JlxOrhFMO+YzViy2bRY8OnAR2vD88p61eT8V2+ENbnMj
+AqXS4HOBpJ6I1Qhff99r0YyvVT/ln9dW7qLAXK3WG27z6HOSWr8KWNUyQD2VLE=
=9yBb
-----END PGP SIGNATURE-----
Merge tag 'v4.3-rc2' into topic/drm-misc
Backmerge Linux 4.3-rc2 because of conflicts in the dp helper code
between bugfixes and new code. Just adjacent lines really.
On top of that there's a silent conflict in the new fsl-dcu driver
merged into 4.3 and
commit
|
||
|---|---|---|
| .. | ||
| exynos7_drm_decon.c | ||
| exynos5433_drm_decon.c | ||
| exynos_dp_core.c | ||
| exynos_dp_core.h | ||
| exynos_dp_reg.c | ||
| exynos_dp_reg.h | ||
| exynos_drm_core.c | ||
| exynos_drm_crtc.c | ||
| exynos_drm_crtc.h | ||
| exynos_drm_dpi.c | ||
| exynos_drm_drv.c | ||
| exynos_drm_drv.h | ||
| exynos_drm_dsi.c | ||
| exynos_drm_fb.c | ||
| exynos_drm_fb.h | ||
| exynos_drm_fbdev.c | ||
| exynos_drm_fbdev.h | ||
| exynos_drm_fimc.c | ||
| exynos_drm_fimc.h | ||
| exynos_drm_fimd.c | ||
| exynos_drm_g2d.c | ||
| exynos_drm_g2d.h | ||
| exynos_drm_gem.c | ||
| exynos_drm_gem.h | ||
| exynos_drm_gsc.c | ||
| exynos_drm_gsc.h | ||
| exynos_drm_iommu.c | ||
| exynos_drm_iommu.h | ||
| exynos_drm_ipp.c | ||
| exynos_drm_ipp.h | ||
| exynos_drm_mic.c | ||
| exynos_drm_plane.c | ||
| exynos_drm_plane.h | ||
| exynos_drm_rotator.c | ||
| exynos_drm_rotator.h | ||
| exynos_drm_vidi.c | ||
| exynos_drm_vidi.h | ||
| exynos_hdmi.c | ||
| exynos_mixer.c | ||
| exynos_mixer.h | ||
| Kconfig | ||
| Makefile | ||
| regs-fimc.h | ||
| regs-gsc.h | ||
| regs-hdmi.h | ||
| regs-mixer.h | ||
| regs-rotator.h | ||
| regs-vp.h | ||