Merge pull request #5101 from alexrp/profiler-api

author Alex Rønne Petersen <alex@alexrp.com>

Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)

committer GitHub <noreply@github.com>

Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)
author Alex Rønne Petersen <alex@alexrp.com>
Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)
committer GitHub <noreply@github.com>
Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)
diff --cc mono/metadata/gc.c
Simple merge
diff --cc mono/mini/tramp-arm.c
Simple merge
diff --cc mono/mini/tramp-arm64.c
Simple merge
author	Alex Rønne Petersen <alex@alexrp.com>
	Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)
committer	GitHub <noreply@github.com>
	Thu, 6 Jul 2017 22:57:16 +0000 (00:57 +0200)
		1	2
mono/metadata/gc.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/tramp-arm.c	patch \|	diff1 \|	diff2 \|	blob \| history
mono/mini/tramp-arm64.c	patch \|	diff1 \|	diff2 \|	blob \| history