From 870e8ca5a762fa7a9f49ff800e0504f6084b6d20 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 26 Jul 2016 01:38:33 +0000
Subject: os/user: fix Solaris declaration.

    Patch from Rainer Orth.

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

From-SVN: r238742
---
 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 99a68ba..320a091 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b156d71ad75a1b73d0ed805a5370a297648d9270
+ffd91f9f72fb93147d4ccce9e4c4a59e4c3c2e62
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
-- 
cgit v1.1