mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01: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
|
||
---|---|---|
.. | ||
fsl_dcu_drm_crtc.c | ||
fsl_dcu_drm_crtc.h | ||
fsl_dcu_drm_drv.c | ||
fsl_dcu_drm_drv.h | ||
fsl_dcu_drm_fbdev.c | ||
fsl_dcu_drm_kms.c | ||
fsl_dcu_drm_output.h | ||
fsl_dcu_drm_plane.c | ||
fsl_dcu_drm_plane.h | ||
fsl_dcu_drm_rgb.c | ||
Kconfig | ||
Makefile |