aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-12-17 09:29:22 +0000
committerJohn Crispin <john@openwrt.org>2015-12-17 09:29:22 +0000
commitd4b8d51580f61bc242b3a51566d2e4afd1f4a150 (patch)
tree16c7b79fae4831e85c1239d0da5869893f7b65fa /target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch
parent98bf3d41207f32bc14ca8b67435ddc75e93b8214 (diff)
downloadupstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.tar.gz
upstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.tar.bz2
upstream-d4b8d51580f61bc242b3a51566d2e4afd1f4a150.zip
brcm2708: update 4.1 patches
As usual, this patches were taken (and rebased) from https://github.com/raspberrypi/linux/commits/rpi-4.1.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> SVN-Revision: 47922
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch')
-rw-r--r--target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch b/target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch
index 5ae3104834..39bb6d60df 100644
--- a/target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch
+++ b/target/linux/brcm2708/patches-4.1/0119-Merge-pull-request-1059-from-pelwell-rpi-4.0.y.patch
@@ -1,7 +1,7 @@
-From f58127f1cc42ee92a87fc7a88ea88071f1b48340 Mon Sep 17 00:00:00 2001
+From a603c307f7348255d19b6031254aac0080e99c37 Mon Sep 17 00:00:00 2001
From: Phil Elwell <pelwell@users.noreply.github.com>
Date: Mon, 13 Jul 2015 13:25:31 +0100
-Subject: [PATCH 119/203] Merge pull request #1059 from pelwell/rpi-4.0.y
+Subject: [PATCH 119/222] Merge pull request #1059 from pelwell/rpi-4.0.y
w1_therm: Back-port locking improvements from 4.2-rc1
---