From 575b67139d8b1c6dee64b5ee239e3e7b5402959b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20G=C3=B6m=C3=B6ri?= <gomoripeti@gmail.com>
Date: Thu, 8 Oct 2015 14:52:37 +0200
Subject: Fix typo in trace gc_start doc

Conflicts:
	erts/doc/src/erlang.xml
---
 erts/doc/src/erlang.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 70d000f763..0d0672de3e 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -8228,7 +8228,7 @@ timestamp() ->
               <tag><c>bin_old_vheap_size</c></tag>
               <item>The total size of unique off-heap binaries referenced
                 from the process old heap.</item>
-              <tag><c>bin_vheap_block_size</c></tag>
+              <tag><c>bin_old_vheap_block_size</c></tag>
 	      <item>The total size of binaries allowed in the virtual
 	        old heap in the process before doing a garbage collection.</item>
             </taglist>
-- 
cgit v1.2.3


From cb62ace6eac881e2b42880c6f645afbc56295ee0 Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Wed, 4 Nov 2015 16:04:54 +0100
Subject: add missing time.h

---
 erts/epmd/src/epmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 132bda725c..63ec18d939 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 #endif
-
+#include <time.h>
 /* forward declarations */
 
 static void usage(EpmdVars *);
-- 
cgit v1.2.3