diff --git a/debian/changelog b/debian/changelog index 49e55e7e3..ee53d41c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,9 +47,11 @@ linux-2.6 (2.6.15-3) UNRELEASED; urgency=low - vgacon: fix doublescan mode - BRIDGE: Fix faulty check in br_stp_recalculate_bridge_id() - skge: handle out of memory on ring changes - + * Drop merged patches: + - sparc64-atyfb-xl-gr-final.patch + - sparc64-entry-strace.patch - -- maximilian attems Sun, 15 Jan 2006 11:34:21 +0100 + -- maximilian attems Sun, 15 Jan 2006 12:05:43 +0100 linux-2.6 (2.6.15-2) unstable; urgency=low diff --git a/debian/patches/series/3 b/debian/patches/series/3 index 5cf834cf4..9f9e58114 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -1,4 +1,6 @@ + arm-fix-dc21285.patch + arm-memory-h-page-shift.patch + mtdpart-redboot-fis-byteswap.patch +- sparc64-atyfb-xl-gr-final.patch +- sparc64-entry-strace.patch + 2.6.15.1.patch