aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-06-04 11:24:42 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-06-04 11:24:42 +0000
commit3a56df33ad00b2f20eb5cb0ceb8d4c1072dc97ad (patch)
tree058c64c69b2d2ec4e599409d26569e2af2451ea9 /target/linux/generic
parent8170c9cfb0d575f5cbaf781b0520b2331e0e9c3c (diff)
downloadupstream-3a56df33ad00b2f20eb5cb0ceb8d4c1072dc97ad.tar.gz
upstream-3a56df33ad00b2f20eb5cb0ceb8d4c1072dc97ad.tar.bz2
upstream-3a56df33ad00b2f20eb5cb0ceb8d4c1072dc97ad.zip
refresh patches
SVN-Revision: 36835
Diffstat (limited to 'target/linux/generic')
-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/