diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-26 15:33:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-26 15:33:07 +0200 |
commit | 1378f4a4d9908dd48dcf21ee526334d86344ec68 (patch) | |
tree | 1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch | |
parent | 2aefb514a4852f4c427b467150bbc7cdfe024528 (diff) | |
parent | 2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (diff) | |
download | upstream-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/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch b/target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch index e3d1415ede..4c2ba2322f 100644 --- a/target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch +++ b/target/linux/mvebu/patches-3.18/025-ARM-mvebu-Use-arm_coherent_dma_ops.patch @@ -93,7 +93,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch> return NOTIFY_OK; } -@@ -405,14 +353,9 @@ static int coherency_type(void) +@@ -399,14 +347,9 @@ static int coherency_type(void) return type; } |