From: Wichert Akkerman <wichert@deephackmode.org>
Date: Fri, 13 Jul 2001 22:19:20 +0000 (+0000)
Subject: Add S390 to architecture list
X-Git-Tag: v4.5.18~1031
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01250b2cc0168b5c63fad0fff9e8406c7733a226;p=strace

Add S390 to architecture list
---

diff --git a/ChangeLog b/ChangeLog
index 2514dfd9..f4e1cfc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,7 +34,6 @@
   * svr4/dummy.h, svr4/syscall.h: now we handle rfork{1,all}, ssisys and
     rexecve calls.
 
->>>>>>> 1.119
 2001-04-12  Wichert Akkerman <wakkerma@debian.org>
 
   * process.c: fix cast for powerpc code