From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 24 Aug 2009 19:57:47 +0000 (+0000)
Subject: 2.6.31: refresh generic patches
X-Git-Tag: reboot~22595
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bdde89eb810bfcd68e67cba74f7024682e21519a;p=openwrt%2Fstaging%2Flynxis.git

2.6.31: refresh generic patches

SVN-Revision: 17368
---

diff --git a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
index 55c97233b4..d8d0840185 100644
--- a/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch
@@ -829,7 +829,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2253,6 +2253,11 @@ T:	git git://git.kernel.org/pub/scm/linu
+@@ -2261,6 +2261,11 @@ T:	git git://git.kernel.org/pub/scm/linu
  S:	Maintained
  F:	drivers/media/video/gspca/
  
diff --git a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
index 0513bf3690..1b8f3a9307 100644
--- a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch
@@ -115,7 +115,7 @@
  				void *caller)
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -726,6 +726,7 @@ static inline int shmem_lock(struct file
+@@ -711,6 +711,7 @@ static inline int shmem_lock(struct file
  #endif
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);