mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[kernel] 2.6.31: refresh generic patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17368 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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/
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user