aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-17 09:29:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-17 09:29:29 +0000
commit1e8f91502ea4870eae700fc57508a715367c3d3a (patch)
treec2e9edc8d7202af3c016c256c56a94fcde0c7a00 /target/linux/generic-2.6
parent2231b9d7611749fba56ae462aff201f7f0c7aa8c (diff)
downloadupstream-1e8f91502ea4870eae700fc57508a715367c3d3a.tar.gz
upstream-1e8f91502ea4870eae700fc57508a715367c3d3a.tar.bz2
upstream-1e8f91502ea4870eae700fc57508a715367c3d3a.zip
kernel: refresh 2.6.32 patches
SVN-Revision: 20952
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch2
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
index e51005f308..e6928dde91 100644
--- a/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/023-mips-fix-kexec.patch
@@ -1,6 +1,6 @@
---- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000
-+++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100
-@@ -52,7 +52,7 @@
+--- a/arch/mips/kernel/machine_kexec.c
++++ b/arch/mips/kernel/machine_kexec.c
+@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
reboot_code_buffer =
(unsigned long)page_address(image->control_code_page);
diff --git a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch b/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
index bc8f8fcff9..b86e259c8d 100644
--- a/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/651-swconfig-2.6.32-fix.patch
@@ -18,7 +18,7 @@
error:
if (cb.msg)
-@@ -728,7 +728,7 @@ swconfig_get_attr(struct sk_buff *skb, s
+@@ -732,7 +732,7 @@ swconfig_get_attr(struct sk_buff *skb, s
goto nla_put_failure;
swconfig_put_dev(dev);