aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-02-19 12:43:59 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-02-19 12:43:59 +0000
commit3cd87d2d817cfffb9b3881fd8a6f350d3bacf134 (patch)
tree54a290220b3bffa93b6ce7644dbe34bc1ea98fd0 /target/linux/generic
parenta0ee5b91fd68fd446b43242eeb33b9033fd3f666 (diff)
downloadupstream-3cd87d2d817cfffb9b3881fd8a6f350d3bacf134.tar.gz
upstream-3cd87d2d817cfffb9b3881fd8a6f350d3bacf134.tar.bz2
upstream-3cd87d2d817cfffb9b3881fd8a6f350d3bacf134.zip
update to 2.6.37.1
SVN-Revision: 25577
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.37/060-block2mtd_init.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/980-vm_exports.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch b/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch
index 2af46a9650..18f0c4e512 100644
--- a/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch
+++ b/target/linux/generic/patches-2.6.37/060-block2mtd_init.patch
@@ -105,7 +105,7 @@
{
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
-@@ -707,6 +707,7 @@ rescan:
+@@ -715,6 +715,7 @@ rescan:
kfree(state);
return 0;
}
diff --git a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch
index 45a096d873..3725b922ce 100644
--- a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch
@@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-@@ -1388,3 +1389,5 @@ MODULE_LICENSE("GPL");
+@@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/target/linux/generic/patches-2.6.37/980-vm_exports.patch b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
index 35b9b925fb..8d8638be31 100644
--- a/target/linux/generic/patches-2.6.37/980-vm_exports.patch
+++ b/target/linux/generic/patches-2.6.37/980-vm_exports.patch
@@ -76,7 +76,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4773,6 +4773,7 @@ int can_nice(const struct task_struct *p
+@@ -4776,6 +4776,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}