ed622fe minor merge window cleanups

Authored and Committed by pbrobinson 4 years ago
39 files changed. 15 lines added. 82 lines removed.
baseconfig/CONFIG_CRYPTO_DEV_CAVIUM_ZIP
file removed
-1
baseconfig/CONFIG_EDAC_MM_EDAC
file removed
-1
baseconfig/CONFIG_LIRC_SASEM
file removed
-1
baseconfig/arm/CONFIG_DRM_DW_HDMIbaseconfig/arm/armv7/CONFIG_DRM_DW_HDMI
file renamed
+0 -0
baseconfig/arm/arm64/CONFIG_SOC_TEGRA_FLOWCTRL
file added
+1
baseconfig/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
file removed
-1
baseconfig/arm/armv7/CONFIG_SOC_TEGRA_FLOWCTRL
file added
+1
baseconfig/x86/i686/CONFIG_EDAC_AMD76Xbaseconfig/x86/CONFIG_EDAC_AMD76X
file renamed
+0 -0
baseconfig/x86/i686/CONFIG_EDAC_E7XXXbaseconfig/x86/CONFIG_EDAC_E7XXX
file renamed
+0 -0
baseconfig/x86/i686/CONFIG_EDAC_I82860baseconfig/x86/CONFIG_EDAC_I82860
file renamed
+0 -0
baseconfig/x86/i686/CONFIG_EDAC_I82875Pbaseconfig/x86/CONFIG_EDAC_I82875P
file renamed
+0 -0
baseconfig/x86/i686/CONFIG_EDAC_R82600baseconfig/x86/CONFIG_EDAC_R82600
file renamed
+0 -0
baseconfig/x86/i686/CONFIG_EDAC_SBRIDGE
file removed
-1
baseconfig/x86/i686PAE/CONFIG_EDAC_AMD76X
file added
+1
baseconfig/x86/i686PAE/CONFIG_EDAC_E7XXX
file added
+1
baseconfig/x86/i686PAE/CONFIG_EDAC_I82860
file added
+1
baseconfig/x86/i686PAE/CONFIG_EDAC_I82875P
file added
+1
baseconfig/x86/i686PAE/CONFIG_EDAC_R82600
file added
+1
baseconfig/x86/i686PAE/CONFIG_EDAC_SBRIDGE
file removed
-1
kernel-aarch64-debug.config
file modified
+2 -2
kernel-aarch64.config
file modified
+2 -2
kernel-armv7hl-debug.config
file modified
+1 -4
kernel-armv7hl-lpae-debug.config
file modified
+1 -4
kernel-armv7hl-lpae.config
file modified
+1 -4
kernel-armv7hl.config
file modified
+1 -4
kernel-i686-PAE.config
file modified
+0 -4
kernel-i686-PAEdebug.config
file modified
+0 -4
kernel-i686-debug.config
file modified
+0 -4
kernel-i686.config
file modified
+0 -4
kernel-ppc64-debug.config
file modified
+0 -3
kernel-ppc64.config
file modified
+0 -3
kernel-ppc64le-debug.config
file modified
+0 -3
kernel-ppc64le.config
file modified
+0 -3
kernel-ppc64p7-debug.config
file modified
+0 -3
kernel-ppc64p7.config
file modified
+0 -3
kernel-s390x-debug.config
file modified
+0 -3
kernel-s390x.config
file modified
+0 -3
kernel-x86_64-debug.config
file modified
+0 -8
kernel-x86_64.config
file modified
+0 -8
    minor merge window cleanups
    
        
baseconfig/arm/CONFIG_DRM_DW_HDMI baseconfig/arm/armv7/CONFIG_DRM_DW_HDMI
file renamed
file was renamed with no change to the file
baseconfig/x86/i686/CONFIG_EDAC_AMD76X baseconfig/x86/CONFIG_EDAC_AMD76X
file renamed
file was renamed with no change to the file
baseconfig/x86/i686/CONFIG_EDAC_E7XXX baseconfig/x86/CONFIG_EDAC_E7XXX
file renamed
file was renamed with no change to the file
baseconfig/x86/i686/CONFIG_EDAC_I82860 baseconfig/x86/CONFIG_EDAC_I82860
file renamed
file was renamed with no change to the file
baseconfig/x86/i686/CONFIG_EDAC_I82875P baseconfig/x86/CONFIG_EDAC_I82875P
file renamed
file was renamed with no change to the file
baseconfig/x86/i686/CONFIG_EDAC_R82600 baseconfig/x86/CONFIG_EDAC_R82600
file renamed
file was renamed with no change to the file
file modified
+2 -2
file modified
+2 -2
file modified
+1 -4
file modified
+1 -4
file modified
+1 -4
file modified
+0 -4
file modified
+0 -4
file modified
+0 -4
file modified
+0 -4
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -3
file modified
+0 -8
file modified
+0 -8