From fe6272cc446f327c8e72c0c99aebd69fe9672c21 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Sat, 16 Dec 2017 01:45:45 +0000
Subject: syscall: emulate Flock on AIX

    Reviewed-on: https://go-review.googlesource.com/79095

From-SVN: r255737
---
 gcc/go/gofrontend/MERGE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gcc/go')

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 14baef5..35a2d0a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c02de8ca63f52a2475ce8645edee3203a3c908ac
+d1f90c9b77baca5c33a398ab844fb4440c6a5ee7
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1