2.6.31: refresh generic patches
SVN-Revision: 17368
This commit is contained in:
parent
72a983bfa1
commit
bdde89eb81
2 changed files with 2 additions and 2 deletions
|
@ -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/
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue