summaryrefslogtreecommitdiff
path: root/debian/patches/series
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2015-02-17 20:38:39 +0100
committerJustus Winter <4winter@informatik.uni-hamburg.de>2015-02-17 20:38:39 +0100
commitb1ff6948ea71dece880e8300029263baba5fa67c (patch)
treeac6035a106a8249f8eac47078a6e5b3d0958e043 /debian/patches/series
parent5092ccf75e6e11e9dcfcc7962c20e24fb3ef93d6 (diff)
drop merged patch
Diffstat (limited to 'debian/patches/series')
-rw-r--r--debian/patches/series1
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/patches/series b/debian/patches/series
index ccf870f4..c1d1462e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,7 +42,6 @@ startup-avoid-broken-puts.patch
libports-payloads.patch
proc-task-notify-0005-proc-fix-build.patch
-merge-me-0001-libports-avoid-acquiring-global-lock-in-message-disp.patch
merge-me-0002-startup-faster-reboots.patch
thomas_term.patch
0001-daemons-console-run-add-console-argument-to-select-t.patch