[PATCH] Merge bk://linux-release@bkbits.net/stable-queue

diff --git a/2.6.11.5/fix-proc-net-route-crash.patch b/2.6.11.5/fix-proc-net-route-crash.patch
index fc94c9e07b3e6ef5c70a0c4446583431fcf64564..db6f8af7245530f9f4f79e122ba36938229f0ccf 100644 (file)
--- a/2.6.11.5/fix-proc-net-route-crash.patch
+++ b/2.6.11.5/fix-proc-net-route-crash.patch
@@ -13,6 +13,7 @@ Subject: [PATCH][IPV4] Fix crash while reading /proc/net/route
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 diff -Nru a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
 --- a/net/ipv4/fib_hash.c      2005-03-17 00:58:42 +01:00

diff --git a/2.6.11.5/fix-xfrm_find_acq_byseq.patch b/2.6.11.5/fix-xfrm_find_acq_byseq.patch
index 5dd18cfdd2742025ed1e98025455fbdd6349f6aa..e8ed7316f66c784dc5ffbd3bbbc1c4da42da54dd 100644 (file)
--- a/2.6.11.5/fix-xfrm_find_acq_byseq.patch
+++ b/2.6.11.5/fix-xfrm_find_acq_byseq.patch
@@ -15,6 +15,7 @@ This is wrong and confuses IPSEC daemons to no end.
 
 Signed-off-by: Patrick McHardy <kaber@trash.net>
 Signed-off-by: Chris Wright <chrisw@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 diff -Nru a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
 --- a/net/xfrm/xfrm_state.c    2005-03-16 14:27:04 -08:00