From: Greg Kroah-Hartman Date: Fri, 13 Jun 2008 23:53:37 +0000 (-0700) Subject: some minor patch fixups to make quilt happy X-Git-Tag: v2.6.25.8~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6aa1b0cc4da2f53de2778c6a184456bae257905b;p=thirdparty%2Fkernel%2Fstable-queue.git some minor patch fixups to make quilt happy --- diff --git a/queue-2.6.25/ps3-fix-frame-buffer-build-error.patch b/queue-2.6.25/ps3-fix-frame-buffer-build-error.patch index 58ee44ffac8..25befa50a0c 100644 --- a/queue-2.6.25/ps3-fix-frame-buffer-build-error.patch +++ b/queue-2.6.25/ps3-fix-frame-buffer-build-error.patch @@ -20,7 +20,7 @@ Prevents this error: Signed-off-by: Geoff Levand Acked-by: Geert Uytterhoeven Cc: Krzysztof Helt -Signed-off-by: Andrew Morton SC +Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- diff --git a/queue-2.6.25/tcp-fix-inconsistency-source.patch b/queue-2.6.25/tcp-fix-inconsistency-source.patch index 59510917049..f255e02bdd6 100644 --- a/queue-2.6.25/tcp-fix-inconsistency-source.patch +++ b/queue-2.6.25/tcp-fix-inconsistency-source.patch @@ -1,10 +1,10 @@ From e193474d6d5658f0bd4429226d64ffb1493e38fa Mon Sep 17 00:00:00 2001 -From: Ilpo Järvinen +From: Ilpo Järvinen Date: Tue, 10 Jun 2008 15:37:34 -0700 Subject: tcp: Fix inconsistency source (CA_Open only when !tcp_left_out(tp)) Message-Id: <20080610.153918.57440222.davem@davemloft.net> -From: Ilpo Järvinen +From: Ilpo Järvinen [ upstream commit: 8aca6cb1179ed9bef9351028c8d8af852903eae2 ] @@ -36,7 +36,7 @@ This bug was found by Brian Vowell while running my TCP debug patch to find cause of another TCP issue (fackets_out miscount). -Signed-off-by: Ilpo Järvinen +Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman