aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-22 12:51:11 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-22 12:51:11 +0000
commita06549a0e4733a2f6d9fa289b67a4e8e48013648 (patch)
tree43bb25331b71ec609717a4c4e7ac6bdfa4edc0ee /target/linux/brcm2708
parentdc98fcc63aee4076ed89aff42c4b2449079c1d34 (diff)
downloadmaster-187ad058-a06549a0e4733a2f6d9fa289b67a4e8e48013648.tar.gz
master-187ad058-a06549a0e4733a2f6d9fa289b67a4e8e48013648.tar.bz2
master-187ad058-a06549a0e4733a2f6d9fa289b67a4e8e48013648.zip
kernel: refresh patches for 4.1
Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46441 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
index c0f6705071..877a5b0a30 100644
--- a/target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
+++ b/target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
@@ -11,7 +11,7 @@ Subject: [PATCH 033/121] config: Enable CONFIG_MEMCG, but leave it disabled
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
-@@ -5395,6 +5395,29 @@ static int __init cgroup_disable(char *s
+@@ -5393,6 +5393,29 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);