summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-06-04 11:24:42 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-06-04 11:24:42 +0000
commit1ad89de63ce0ddbb04a23dd09fe631603c53edca (patch)
tree7be3519364266053168990a3f1e709f6452e81ec /target
parentca919077a3f8160b6d5916f22902167f18f5639a (diff)
[generic/3.10]: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36835 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.10/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.10/863-gpiommc.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/100-overlayfs.patch b/target/linux/generic/patches-3.10/100-overlayfs.patch
index beb61ba43a..e8896aa9e3 100644
--- a/target/linux/generic/patches-3.10/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.10/100-overlayfs.patch
@@ -243,7 +243,7 @@
will be called when part or all of the page is to be removed
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -6008,6 +6008,13 @@ F: drivers/scsi/osd/
+@@ -6009,6 +6009,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
diff --git a/target/linux/generic/patches-3.10/863-gpiommc.patch b/target/linux/generic/patches-3.10/863-gpiommc.patch
index 02305360fa..a9101f473b 100644
--- a/target/linux/generic/patches-3.10/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.10/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3669,6 +3669,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -3670,6 +3670,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/