mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Merge drm/drm-next into drm-misc-next
Bring rc1 to start the new release dev. Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
@@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y
|
||||
CONFIG_SOC_SAMA5D2=y
|
||||
CONFIG_SOC_SAMA5D3=y
|
||||
CONFIG_SOC_SAMA5D4=y
|
||||
CONFIG_SOC_SAMA7D65=y
|
||||
CONFIG_SOC_SAMA7G5=y
|
||||
CONFIG_SOC_LAN966=y
|
||||
CONFIG_ARCH_BCM=y
|
||||
@@ -1306,7 +1307,6 @@ CONFIG_CRYPTO_AES_ARM=m
|
||||
CONFIG_CRYPTO_AES_ARM_BS=m
|
||||
CONFIG_CRYPTO_AES_ARM_CE=m
|
||||
CONFIG_CRYPTO_CHACHA20_NEON=m
|
||||
CONFIG_CRYPTO_CRC32_ARM_CE=m
|
||||
CONFIG_CRYPTO_DEV_SUN4I_SS=m
|
||||
CONFIG_CRYPTO_DEV_FSL_CAAM=m
|
||||
CONFIG_CRYPTO_DEV_EXYNOS_RNG=m
|
||||
|
||||
Reference in New Issue
Block a user