Merge pull request #4630 from BrzVlad/feature-valloc-limit

author Vlad Brezae <brezaevlad@gmail.com>

Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)

committer GitHub <noreply@github.com>

Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)
author Vlad Brezae <brezaevlad@gmail.com>
Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)
committer GitHub <noreply@github.com>
Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)
diff --cc mono/sgen/sgen-gc.c
Simple merge
diff --cc mono/utils/mono-mmap.c
Simple merge
author	Vlad Brezae <brezaevlad@gmail.com>
	Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)
committer	GitHub <noreply@github.com>
	Tue, 4 Apr 2017 23:52:03 +0000 (02:52 +0300)
		1	2
mono/sgen/sgen-gc.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/utils/mono-mmap.c	patch \|	diff1 \|	diff2 \|	blob \| history