diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
| commit | f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (patch) | |
| tree | f4e3850683bbb922227f58993e41a4784a670932 /target/linux/brcm2708 | |
| parent | 40a09b93d274737c704165f687149b4956fbd45c (diff) | |
| download | upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.gz upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.bz2 upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.zip | |
kernel: update 4.1 to 4.1.13
- two upstreamed patches removed
- compile tested all targets using 4.1
- run tested ar71xx
Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47694
Diffstat (limited to 'target/linux/brcm2708')
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0032-Added-Device-IDs-for-August-DVB-T-205.patch b/target/linux/brcm2708/patches-4.1/0032-Added-Device-IDs-for-August-DVB-T-205.patch index f8cf48563a..514fee0bfa 100644 --- a/target/linux/brcm2708/patches-4.1/0032-Added-Device-IDs-for-August-DVB-T-205.patch +++ b/target/linux/brcm2708/patches-4.1/0032-Added-Device-IDs-for-August-DVB-T-205.patch @@ -9,7 +9,7 @@ Subject: [PATCH 032/203] Added Device IDs for August DVB-T 205 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -@@ -1744,6 +1744,10 @@ static const struct usb_device_id rtl28x +@@ -1755,6 +1755,10 @@ static const struct usb_device_id rtl28x &rtl28xxu_props, "Compro VideoMate U620F", NULL) }, { DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394, &rtl28xxu_props, "MaxMedia HU394-T", NULL) }, 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 00a9532614..5a1d8c72c5 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 @@ -43,7 +43,7 @@ Subject: [PATCH 033/203] config: Enable CONFIG_MEMCG, but leave it disabled printk("cgroup: using legacy files on the default hierarchy\n"); --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -5388,6 +5388,7 @@ struct cgroup_subsys memory_cgrp_subsys +@@ -5389,6 +5389,7 @@ struct cgroup_subsys memory_cgrp_subsys .dfl_cftypes = memory_files, .legacy_cftypes = mem_cgroup_legacy_files, .early_init = 0, |