aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-10-26 15:33:07 +0200
committerGitHub <noreply@github.com>2016-10-26 15:33:07 +0200
commit1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch)
tree1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
parent2aefb514a4852f4c427b467150bbc7cdfe024528 (diff)
parent2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff)
downloadupstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.gz
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.tar.bz2
upstream-1378f4a4d9908dd48dcf21ee526334d86344ec68.zip
Merge pull request #151 from wigyori/cc-dirtycow
CC: generic: bump kernel to 3.18.44
Diffstat (limited to 'target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch')
-rw-r--r--target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch b/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
index 12b4628f04..168e9f82b0 100644
--- a/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
+++ b/target/linux/sunxi/patches-3.18/110-input-add-sun4i-lradc.patch
@@ -94,7 +94,7 @@ Changes in v2:
+ };
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -9002,6 +9002,13 @@ F: arch/m68k/sun3*/
+@@ -9015,6 +9015,13 @@ F: arch/m68k/sun3*/
F: arch/m68k/include/asm/sun3*
F: drivers/net/ethernet/i825xx/sun3*