From 0828cb438ac9755115e648a25e9f55bfed240bb9 Mon Sep 17 00:00:00 2001
From: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Date: Fri, 11 Dec 2015 13:11:28 +0530
Subject: [PATCH] mailmap: John Coyle affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Conflicts:
	.organizationmap
Trivial merge conflict as upstream had an additional entry
---
 .organizationmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.organizationmap b/.organizationmap
index b98094d3fa610..3cea398f308fe 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -389,6 +389,8 @@ Unaffiliated <no@organization.net> Jeff Weber <jweber@cofront.net>
 Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
 Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
 Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
+Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
+Unaffiliated <no@organization.net> John Coyle <dx9err@gmail.com>
 Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Jordan Dorne <jordan.dorne@gmail.com>
 Unaffiliated <no@organization.net> Kadu Ribeiro <mail+github@carlosribeiro.me>
-- 
2.39.5