[kernel] 2.6.31: refresh generic patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17368 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 55c9723..d8d0840 100644 (file)
--- 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
 +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/
  
  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 0513bf3..1b8f3a9 100644 (file)
--- 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
                                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);
  
  #endif
  struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);