2.6.31: refresh generic patches

SVN-Revision: 17368
lede-17.01
Gabor Juhos 2009-08-24 19:57:47 +00:00
parent 72a983bfa1
commit bdde89eb81
2 changed files with 2 additions and 2 deletions

View File

@ -829,7 +829,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/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 S: Maintained
F: drivers/media/video/gspca/ F: drivers/media/video/gspca/

View File

@ -115,7 +115,7 @@
void *caller) void *caller)
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/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 #endif
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);