aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 00:17:17 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2017-02-12 00:17:17 +0100
commitb10537557f99b6df5be5d6438378031a9a1f7ce5 (patch)
treef65892b7c5dfed78348544bb90711ce25cc9552e
parenta24967c0cd61bdfbd383abf9b99cb42d1715396b (diff)
parentd472384ab4cb5f174cc957493eb161900c3fb3ee (diff)
downloadkernel_samsung_smdk4412-b10537557f99b6df5be5d6438378031a9a1f7ce5.zip
kernel_samsung_smdk4412-b10537557f99b6df5be5d6438378031a9a1f7ce5.tar.gz
kernel_samsung_smdk4412-b10537557f99b6df5be5d6438378031a9a1f7ce5.tar.bz2
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_kernel_samsung_smdk4412 into replicant-6.0replicant-6.0-beta-0002
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--arch/arm/configs/lineageos_d710_defconfig (renamed from arch/arm/configs/cyanogenmod_d710_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_i777_defconfig (renamed from arch/arm/configs/cyanogenmod_i777_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_i9100_defconfig (renamed from arch/arm/configs/cyanogenmod_i9100_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_i925_defconfig (renamed from arch/arm/configs/cyanogenmod_i925_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_i9300_defconfig (renamed from arch/arm/configs/cyanogenmod_i9300_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_i9305_defconfig (renamed from arch/arm/configs/cyanogenmod_i9305_defconfig)4
-rw-r--r--arch/arm/configs/lineageos_n5100_defconfig (renamed from arch/arm/configs/cyanogenmod_n5100_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n5110_defconfig (renamed from arch/arm/configs/cyanogenmod_n5110_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n5120_defconfig (renamed from arch/arm/configs/cyanogenmod_n5120_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n7000_defconfig (renamed from arch/arm/configs/cyanogenmod_n7000_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n7100_defconfig (renamed from arch/arm/configs/cyanogenmod_n7100_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n8000_defconfig (renamed from arch/arm/configs/cyanogenmod_n8000_defconfig)2
-rw-r--r--arch/arm/configs/lineageos_n8013_defconfig (renamed from arch/arm/configs/cyanogenmod_n8013_defconfig)2
-rwxr-xr-xarch/arm/configs/lineageos_t0lte_defconfig (renamed from arch/arm/configs/cyanogenmod_t0lte_defconfig)2
-rwxr-xr-xarch/arm/configs/lineageos_t0ltecdma_defconfig (renamed from arch/arm/configs/cyanogenmod_t0ltecdma_defconfig)2
15 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/configs/cyanogenmod_d710_defconfig b/arch/arm/configs/lineageos_d710_defconfig
index ecc7052..ea28368 100644
--- a/arch/arm/configs/cyanogenmod_d710_defconfig
+++ b/arch/arm/configs/lineageos_d710_defconfig
@@ -37,7 +37,7 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_i777_defconfig b/arch/arm/configs/lineageos_i777_defconfig
index 12a6419..f9fc992 100644
--- a/arch/arm/configs/cyanogenmod_i777_defconfig
+++ b/arch/arm/configs/lineageos_i777_defconfig
@@ -37,7 +37,7 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_i9100_defconfig b/arch/arm/configs/lineageos_i9100_defconfig
index 43397e2..9381675 100644
--- a/arch/arm/configs/cyanogenmod_i9100_defconfig
+++ b/arch/arm/configs/lineageos_i9100_defconfig
@@ -37,7 +37,7 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_i925_defconfig b/arch/arm/configs/lineageos_i925_defconfig
index 08b4ef3..655552c 100644
--- a/arch/arm/configs/cyanogenmod_i925_defconfig
+++ b/arch/arm/configs/lineageos_i925_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/lineageos_i9300_defconfig
index 8d5ea8d..9df5997 100644
--- a/arch/arm/configs/cyanogenmod_i9300_defconfig
+++ b/arch/arm/configs/lineageos_i9300_defconfig
@@ -37,7 +37,7 @@ CONFIG_HAVE_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_i9305_defconfig b/arch/arm/configs/lineageos_i9305_defconfig
index 038877d..79a9924 100644
--- a/arch/arm/configs/cyanogenmod_i9305_defconfig
+++ b/arch/arm/configs/lineageos_i9305_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
@@ -902,7 +902,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
# CONFIG_NETFILTER_XT_TARGET_CT is not set
# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
# CONFIG_NETFILTER_XT_TARGET_HL is not set
-# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
# CONFIG_NETFILTER_XT_TARGET_LED is not set
CONFIG_NETFILTER_XT_TARGET_MARK=y
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
diff --git a/arch/arm/configs/cyanogenmod_n5100_defconfig b/arch/arm/configs/lineageos_n5100_defconfig
index 98e0b72..b968119 100644
--- a/arch/arm/configs/cyanogenmod_n5100_defconfig
+++ b/arch/arm/configs/lineageos_n5100_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n5110_defconfig b/arch/arm/configs/lineageos_n5110_defconfig
index 800b023..0e3bd44 100644
--- a/arch/arm/configs/cyanogenmod_n5110_defconfig
+++ b/arch/arm/configs/lineageos_n5110_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n5120_defconfig b/arch/arm/configs/lineageos_n5120_defconfig
index 445e41a..ab135b4 100644
--- a/arch/arm/configs/cyanogenmod_n5120_defconfig
+++ b/arch/arm/configs/lineageos_n5120_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n7000_defconfig b/arch/arm/configs/lineageos_n7000_defconfig
index ca6968c..c0e9e87 100644
--- a/arch/arm/configs/cyanogenmod_n7000_defconfig
+++ b/arch/arm/configs/lineageos_n7000_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n7100_defconfig b/arch/arm/configs/lineageos_n7100_defconfig
index 124066d..c2fb348 100644
--- a/arch/arm/configs/cyanogenmod_n7100_defconfig
+++ b/arch/arm/configs/lineageos_n7100_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n8000_defconfig b/arch/arm/configs/lineageos_n8000_defconfig
index 45cf051..51b776a 100644
--- a/arch/arm/configs/cyanogenmod_n8000_defconfig
+++ b/arch/arm/configs/lineageos_n8000_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_n8013_defconfig b/arch/arm/configs/lineageos_n8013_defconfig
index f55906c..08695d7 100644
--- a/arch/arm/configs/cyanogenmod_n8013_defconfig
+++ b/arch/arm/configs/lineageos_n8013_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_t0lte_defconfig b/arch/arm/configs/lineageos_t0lte_defconfig
index 7a07860..824e841 100755
--- a/arch/arm/configs/cyanogenmod_t0lte_defconfig
+++ b/arch/arm/configs/lineageos_t0lte_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
diff --git a/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig b/arch/arm/configs/lineageos_t0ltecdma_defconfig
index 4a914ff..ea9d181 100755
--- a/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig
+++ b/arch/arm/configs/lineageos_t0ltecdma_defconfig
@@ -38,7 +38,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-CM"
+CONFIG_LOCALVERSION="-lineage"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y