diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-08-24 19:57:47 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-08-24 19:57:47 +0000 |
| commit | a58fc1263babf8f1d48c7b1deecf6418df44209f (patch) | |
| tree | b9a22838ca8cf03159ae3e5b1a6caf0cf1e38de7 /target/linux/generic-2.6/patches-2.6.31 | |
| parent | 46c9bd7908ac4ef1c1c5cf1762b1671b04bf94b6 (diff) | |
| download | upstream-a58fc1263babf8f1d48c7b1deecf6418df44209f.tar.gz upstream-a58fc1263babf8f1d48c7b1deecf6418df44209f.tar.bz2 upstream-a58fc1263babf8f1d48c7b1deecf6418df44209f.zip | |
[kernel] 2.6.31: refresh generic patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17368 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/922-gpiommc.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch | 2 |
2 files changed, 2 insertions, 2 deletions
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); |