mailmap: sort {organization,mail}map

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/.mailmap b/.mailmap
index 1e13f36c41605fde9239d7ed8ce19f98bf9a77d1..fc7a27fab218a1de0d0afaf1bad5fa74a5736bc7 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -34,6 +34,7 @@ Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
 Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
+Ce Gu <guce@h3c.com> guce <guce@h3c.com>
 Chendi Xue <chendi.xue@intel.com> Chendi.Xue <chendi.xue@intel.com>
 Chendi Xue <chendi.xue@intel.com> Chendi Xue <xuechendi@gmail.com>
 Cheng Cheng <ccheng.leo@gmail.com> cchengleo <ccheng.leo@gmail.com>
@@ -52,6 +53,7 @@ David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
 Dmitry Yatsushkevich <dyatsushkevich@mirantis.com> <dmitry.yatsushkevich@gmail.com>
 Dominik Hannen <cantares1+github@gmail.com> Dominik Hannen <dhxgit@users.noreply.github.com>
+Donghai Xu <xu.donghai@h3c.com> x11507 <xu.donghai@h3c.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> eestolan <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
@@ -68,8 +70,8 @@ Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
 Gaurav Kumar Garg <garg.gaurav52@gmail.com> <ggarg@redhat.com>
 Gerben Meijer <gerben@daybyday.nl> <infernix@gmail.com>
 Greg Farnum <gfarnum@redhat.com> <gfarnum@GF-Macbook.local>
-Greg Farnum <gfarnum@redhat.com> <greg@gregs42.com>
 Greg Farnum <gfarnum@redhat.com> <gfarnum@rehdat.com>
+Greg Farnum <gfarnum@redhat.com> <greg@gregs42.com>
 Greg Farnum <greg@inktank.com> Greg Farnu <greg@inktank.com>
 Greg Farnum <greg@inktank.com> <greg.farnum@dreamhost.com>
 Greg Farnum <greg@inktank.com> <gregf@hq.newdream.net>
@@ -87,8 +89,8 @@ Holger Macht <hmacht@suse.de> <holger@homac.de>
 Huamin Chen <hchen@redhat.com> rootfs <hchen@redhat.com>
 Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
 Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
-Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
 Ilja Slepnev <islepnev@gmail.com>
+Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
 Ismael Serrano <ismael.serrano@gmail.com> <ismaels@qti.qualcomm.com>
 Jean-Charles Lopez <jelopez@redhat.com> jeanchlopez <jelopez@redhat.com>
 Jiang Heng <jiangheng0511@gmail.com> jiangheng <jiangheng0511@gmail.com>
@@ -125,6 +127,7 @@ Loic Dachary <ldachary@redhat.com> <dachary@users.noreply.github.com>
 Loic Dachary <ldachary@redhat.com> <ldachary@dachary.org>
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
+Lu Shi <shi.lu@h3c.com> s09816 <shi.lu@h3c.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
@@ -137,19 +140,22 @@ Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
 Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
 Michael Rodriguez <michael@newdream.net> <michael@newdream.net>
 Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
+Mingyue Zhao <zhao.mingyue@h3c.com> mingyuez <zhao.mingyue@h3c.com>
 Mykola Golub <mgolub@mirantis.com> Mykola Golub <mgolub@zhuzha.mirantis.lviv.net>
 Nathan Cutler <ncutler@suse.com> <ncutler@suse.cz>
+Na Xie <xie.na@h3c.com> x11562 <xie.na@h3c.com>
+Neha Ummareddy <nehaummareddy@gmail.com> nehaummareddy <nehaummareddy@gmail.com>
 Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
 Ning Yao <yaoning@ruijie.com.cn> <zay11022@gmail.com>
 Noah Watkins <nwatkins@redhat.com> <jayhawk@cs.ucsc.edu>
 Noah Watkins <nwatkins@redhat.com> <noahwatkins@gmail.com>
-Neha Ummareddy <nehaummareddy@gmail.com> nehaummareddy <nehaummareddy@gmail.com>
 Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>
 Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Patrick McGarry <patrick@inktank.com> scuttlemonkey <patrick@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> <pmcgarry@gmail.com>
 Pavan Rallabhandi <pavan.rallabhandi@sandisk.com> Pavan Rallabhandi <pavanrallabhandis@gmail.com>
 Pete Zaitcev <zaitcev@redhat.com> <zaitcev@kotori.zaitcev.us>
+Qiankun Zheng <zheng.qiankun@h3c.com> zqkqkz  <zheng.qiankun@h3c.com>
 Riccardo Ferretti <rferrett@soe.ucsc.edu> rferrett <rferrett@29311d96-e01e-0410-9327-a35deaab8ce9>
 Roald J. van Loon <roald@roaldvanloon.nl> <roaldvanloon@gmail.com>
 Robert Jansen <r.jansen@fairbanks.nl> <r.jansen86@gmail.com>
@@ -157,6 +163,7 @@ Robin Dehu <robindehu@gmail.com> <rdehu@prune>
 Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Ross Turk <ross.turk@inktank.com> <ross@inktank.com> 
 Ross Turk <ross.turk@inktank.com> <ross.turk@dreamhost.com>
+Ruifeng Yang <yangruifeng.09209@h3c.com> Ruifeng Yang <149233652@qq.com>
 Sage Weil <sage@inktank.com> <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
 Sage Weil <sage@inktank.com> <sage@ceph0.dreamhost.com>
 Sage Weil <sage@inktank.com> <sage@foil.westwood.newdream.net>
@@ -207,18 +214,21 @@ Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
 Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
 Travis Rhoden <trhoden@redhat.com> <trhoden@gmail.com>
 Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
+Varada Kari <varada.kari@sandisk.com> <kariraja@yahoo.com>
 Volker Assmann <volker@twisted-nerve.de> <volker@36-135.mops.RWTH-Aachen.DE>
 Volker Assmann <volker@twisted-nerve.de> <volker@stan.local>
-Varada Kari <varada.kari@sandisk.com> <kariraja@yahoo.com>
 Walter Huf <hufman@gmail.com> Walter J. Huf <hufman@gmail.com>
 Wang, Yaguang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
 Warren Usui <warren.usui@inktank.com> wusui <warren.usui@inktank.com>
+Weijun Duan <duanweijun@h3c.com> duanweijun <duanweijun@h3c.com>
 Wei Luo <luowei@yahoo-inc.com> luowei <luowei@yahoo-inc.com>
 Wido den Hollander <wido@42on.com> <wido@widodh.nl>
 Xan Peng <xanpeng@gmail.com> xan <xanpeng@gmail.com>
 Xavier Roche <roche+git@exalead.com> <roche@httrack.com>
+Xiaowei Chen <chen.xiaowei@h3c.com> shawn chen <cxwshawn@gmail.com>
 Xie Rui <875016668@qq.com> Jerry7X <875016668@qq.com>
 Xingyi Wu <wuxingyi2015@outlook.com>
+Xuan Liu <liu.xuan@h3c.com> l11625 <liu.xuan@h3c.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng Yan <zheng.z.yan@intel.com>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
@@ -236,20 +246,10 @@ Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@rehat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <ysadeh@redhat.com>
 Yongyue Sun <abioy.sun@gmail.com> Abioy <abioy.sun@gmail.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
+Zengran Zhang <zhangzengran@h3c.com> Aran85 <zhangzengran@h3c.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> Zhi Z Zhang <zhangz@yahoo-inc.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Wang, Zhiqiang <zhiqiang.wang@intel.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Zhiqiang Wang <wonzhq@hotmail.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
-Ce Gu <guce@h3c.com> guce <guce@h3c.com>
-Zengran Zhang <zhangzengran@h3c.com> Aran85 <zhangzengran@h3c.com>
-Weijun Duan <duanweijun@h3c.com> duanweijun <duanweijun@h3c.com>
-Lu Shi <shi.lu@h3c.com> s09816 <shi.lu@h3c.com>
-Na Xie <xie.na@h3c.com> x11562 <xie.na@h3c.com>
-Ruifeng Yang <yangruifeng.09209@h3c.com> Ruifeng Yang <149233652@qq.com>
-Xiaowei Chen <chen.xiaowei@h3c.com> shawn chen <cxwshawn@gmail.com>
-Xuan Liu <liu.xuan@h3c.com> l11625 <liu.xuan@h3c.com>
-Donghai Xu <xu.donghai@h3c.com> x11507 <xu.donghai@h3c.com>
-Mingyue Zhao <zhao.mingyue@h3c.com> mingyuez <zhao.mingyue@h3c.com>
-Qiankun Zheng <zheng.qiankun@h3c.com> zqkqkz  <zheng.qiankun@h3c.com>

diff --git a/.organizationmap b/.organizationmap
index 381f95299d095dbdf7a95ad79e8beb9c7a990dd5..0946f00b924581c3e7d5879b589da350c5d39015 100644 (file)
--- a/.organizationmap
+++ b/.organizationmap
@@ -50,8 +50,8 @@ Cloudwatt <libre.licensing@cloudwatt.com> Christophe Courtaut <christophe.courta
 Cloudwatt <libre.licensing@cloudwatt.com> Florent Flament <florent.flament@cloudwatt.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
 Cloudwatt <libre.licensing@cloudwatt.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
-CohortFS, LLC <contact@cohortfs.com> Matt Benjamin <matt@cohortfs.com>
 CohortFS, LLC <contact@cohortfs.com> Casey Bodley <casey@cohortfs.com>
+CohortFS, LLC <contact@cohortfs.com> Matt Benjamin <matt@cohortfs.com>
 Commerce Guys <contact@commerceguys.com> Nikola Kotur <kotnick@gmail.com>
 Corvisa LLC <contact@corvisa.com> Walter Huf <hufman@gmail.com>
 Credit Mutuel Arkea <contact@arkea.com> Eric Mourgaya <eric.mourgaya@arkea.com>
@@ -92,6 +92,44 @@ gocept gmbh & co. kg <mail@gocept.com> Christian Theune <ct@gocept.com>
 GRNet <contact@grnet.gr> Filippos Giannakos <philipgian@grnet.gr>
 GRNet <contact@grnet.gr> Stratos Psomadakis <psomas@grnet.gr>
 GRNet <contact@grnet.gr> Vangelis Koukis <vkoukis@cslab.ece.ntua.gr>
+H3C <contact@h3c.com> Bingxin Yang <yangbingxin@h3c.com>
+H3C <contact@h3c.com> Bin Zheng <zhengbin.08747@h3c.com>
+H3C <contact@h3c.com> Bo Cai <cai.bo@h3c.com>
+H3C <contact@h3c.com> Ce Gu <guce@h3c.com>
+H3C <contact@h3c.com> Chunyan Ma <ma.chunyan@h3c.com>
+H3C <contact@h3c.com> Donghai Xu <xu.donghai@h3c.com>
+H3C <contact@h3c.com> Fei Wang <wang.fei@h3c.com>
+H3C <contact@h3c.com> Jie Chen <chen.jie@h3c.com>
+H3C <contact@h3c.com> Jie Li <li.jieA@h3c.com>
+H3C <contact@h3c.com> Kongming Wu <wu.kongming@h3c.com>
+H3C <contact@h3c.com> Lu Shi <shi.lu@h3c.com>
+H3C <contact@h3c.com> Mingyue Zhao <zhao.mingyue@h3c.com>
+H3C <contact@h3c.com> Ming Zou <zou.ming@h3c.com>
+H3C <contact@h3c.com> Na Xie <xie.na@h3c.com>
+H3C <contact@h3c.com> Ni Dang <dang.ni@h3c.com>
+H3C <contact@h3c.com> Peiyang Liu <liu.peiyang@h3c.com>
+H3C <contact@h3c.com> Qiang Guo <guo.qiang@h3c.com>
+H3C <contact@h3c.com> Qiankun Zheng <zheng.qiankun@h3c.com>
+H3C <contact@h3c.com> Ruifeng Yang <yangruifeng.09209@h3c.com>
+H3C <contact@h3c.com> Sangdi Xu <xu.sangdi@h3c.com>
+H3C <contact@h3c.com> Shan Li <li.shan@h3c.com>
+H3C <contact@h3c.com> Siyuan Zhou <zhou.siyuan@h3c.com>
+H3C <contact@h3c.com> Tingting Chi <chitingting@h3c.com>
+H3C <contact@h3c.com> Weijun Duan <duanweijun@h3c.com>
+H3C <contact@h3c.com> Wenfeng Wang <wang.wenfeng@h3c.com>
+H3C <contact@h3c.com> Xiangwei Wu <wuxiangwei@h3c.com>
+H3C <contact@h3c.com> Xiaofeng Feng <feng.xiaofeng@h3c.com>
+H3C <contact@h3c.com> Xiaowei Chen <chen.xiaowei@h3c.com>
+H3C <contact@h3c.com> Xuan Liu <liu.xuan@h3c.com>
+H3C <contact@h3c.com> Xudong Cao <cao.xudong@h3c.com>
+H3C <contact@h3c.com> Yanbin Wu <Wu.yanbin@h3c.com>
+H3C <contact@h3c.com> Yehua Chen <chen.yehua@h3c.com>
+H3C <contact@h3c.com> Yongqiang He <he.yongqiang@h3c.com>
+H3C <contact@h3c.com> Yue Zhu <zhu.yue@h3c.com>
+H3C <contact@h3c.com> Yunhui Chen <chen.yunhui@h3c.com>
+H3C <contact@h3c.com> Zengran Zhang <zhangzengran@h3c.com>
+H3C <contact@h3c.com> Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
+H3C <contact@h3c.com> Zhanyang Chen <Chen.zhanyang@h3c.com>
 Hastexo <contact@hastexo.com> Florian Haas <florian@hastexo.com>
 HGST <contact@hgst.com> Kevin Dalley <kevin@kelphead.org>
 HGST <contact@hgst.com> Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
@@ -148,8 +186,8 @@ IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
 Karlsruhe Institute of Technology <ceph@lists.kit.edu> Daniel J. Hofmann <daniel@trvx.org>
 Keeper Technology <contact@keepertech.com> Wyllys Ingersoll <wyllys.ingersoll@keepertech.com>
 Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
-Linaro <contact@linaro.org> Yazen Ghannam <yazen.ghannam@linaro.org>
 Linaro <contact@linaro.org> Steve Capper <steve.capper@linaro.org>
+Linaro <contact@linaro.org> Yazen Ghannam <yazen.ghannam@linaro.org>
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
 Mellanox <contact@mellanox.com> Vu Pham <vu@mellanox.com>
 Mirantis <contact@mirantis.com> Andrew Woodward <awoodward@mirantis.com>
@@ -160,8 +198,8 @@ Mirantis <contact@mirantis.com> Mykola Golub <mgolub@mirantis.com>
 Mirantis <contact@mirantis.com> Radoslaw Zarzynski <rzarzynski@mirantis.com>
 MIT Computer Science and Artificial Intelligence Laboratory <webmaster@csail.mit.edu> Stephen Jahl <stephenjahl@gmail.com>
 MSys Technologies <contact@msystechnologies.com> Rajesh Nambiar <rajesh.n@msystechnologies.com>
-Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
 Nebula <info@nebula.com> Anton Aksola <anton.aksola@nebula.fi>
+Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
 Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>
 Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>
 Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Erwin@pnl.gov>
@@ -214,8 +252,8 @@ Red Hat <contact@redhat.com> Tamil Muthamizhan <tmuthami@redhat.com>
 Red Hat <contact@redhat.com> Tom Callaway <spot@redhat.com>
 Red Hat <contact@redhat.com> Travis Rhoden <trhoden@redhat.com>
 Red Hat <contact@redhat.com> Tyler Brekke <tbrekke@redhat.com>
-Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
 Red Hat <contact@redhat.com> Vasu Kulkarni <vasu@redhat.com>
+Red Hat <contact@redhat.com> Venky Shankar <vshankar@redhat.com>
 Red Hat <contact@redhat.com> Warren Usui <wusui@redhat.com>
 Red Hat <contact@redhat.com> Yan, Zheng <zyan@redhat.com>
 Red Hat <contact@redhat.com> Yehuda Sadeh <ysadehwe@redhat.com>
@@ -292,11 +330,10 @@ Unaffiliated <no@organization.net> Florian Coste <fcoste21@gmail.com>
 Unaffiliated <no@organization.net> Florian Marsylle <florian.marsylle@hotmail.fr>
 Unaffiliated <no@organization.net> François Lafont <flafdivers@free.fr>
 Unaffiliated <no@organization.net> Frank Yu <flyxiaoyu@gmail.com>
-Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Gaurav Kumar Garg <garg.gaurav52@gmail.com>
-Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
 Unaffiliated <no@organization.net> Haomai Wang <haomaiwang@gmail.com>
 Unaffiliated <no@organization.net> Henry Chang <henry@bigtera.com>
+Unaffiliated <no@organization.net> Huang Jun <hjwsm1989@gmail.com>
 Unaffiliated <no@organization.net> Ian Kelling <ian@iankelling.org>
 Unaffiliated <no@organization.net> Ilja Slepnev <islepnev@gmail.com>
 Unaffiliated <no@organization.net> Ismael Serrano <ismael.serrano@gmail.com>
@@ -305,6 +342,7 @@ Unaffiliated <no@organization.net> Javier Guerra <javier@guerrag.com>
 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> Jon Bernard <jbernard@tuxion.com>
 Unaffiliated <no@organization.net> Karel Striegel <karel.striegel@ipc.be>
 Unaffiliated <no@organization.net> Kefu Chai <tchaikov@gmail.com>
 Unaffiliated <no@organization.net> Kernel Neophyte <neophyte.hacker001@gmail.com>
@@ -330,23 +368,23 @@ Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
 Unaffiliated <no@organization.net> Simon Guinot <simon.guinot@sequanux.org>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
-Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
 Unaffiliated <no@organization.net> Thomas Johnson <ntmatter@gmail.com>
+Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
 Unaffiliated <no@organization.net> Vartika Rai <vartikarai17@gmail.com>
 Unaffiliated <no@organization.net> Vicente Cheng <freeze.bilsted@gmail.com>
 Unaffiliated <no@organization.net> Viktor Suprun <popsul1993@gmail.com>
 Unaffiliated <no@organization.net> Volker Voigt <volker.voigt@1und1.de>
 Unaffiliated <no@organization.net> VRan Liu <gliuwr@gmail.com>
 Unaffiliated <no@organization.net> William A. Kennington III <william@wkennington.com>
-Unaffiliated <no@organization.net> Xingyi Wu <wuxingyi2015@outlook.com>
 Unaffiliated <no@organization.net> Xan Peng <xanpeng@gmail.com>
 Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
+Unaffiliated <no@organization.net> Xingyi Wu <wuxingyi2015@outlook.com>
 Unaffiliated <no@organization.net> Xinze Chi <xmdxcxz@gmail.com>
 Unaffiliated <no@organization.net> Xiong Yiliang <xiongyiliang@xunlei.com>
 Unaffiliated <no@organization.net> Yann Dupont <yann@objoo.org>
 Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
-Unaffiliated <no@organization.net> Zhicheng Wei <zhicheng@opensourceforge.net>
 Unaffiliated <no@organization.net> Zhe Zhang <zzxuanyuan@gmail.com>
+Unaffiliated <no@organization.net> Zhicheng Wei <zhicheng@opensourceforge.net>
 Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net> 
 UnitedStack <contact@unitedstack.com> Dong Yuan <yuandong1222@gmail.com>
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
@@ -380,44 +418,6 @@ Yahoo! <contact@yahoo-inc.com> Wei Luo <luowei@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
 Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
-H3C <contact@h3c.com> Ce Gu <guce@h3c.com>
-H3C <contact@h3c.com> Zengran Zhang <zhangzengran@h3c.com>
-H3C <contact@h3c.com> Weijun Duan <duanweijun@h3c.com>
-H3C <contact@h3c.com> Lu Shi <shi.lu@h3c.com>
-H3C <contact@h3c.com> Na Xie <xie.na@h3c.com>
-H3C <contact@h3c.com> Ruifeng Yang <yangruifeng.09209@h3c.com>
-H3C <contact@h3c.com> Xiaowei Chen <chen.xiaowei@h3c.com>
-H3C <contact@h3c.com> Xuan Liu <liu.xuan@h3c.com>
-H3C <contact@h3c.com> Donghai Xu <xu.donghai@h3c.com>
-H3C <contact@h3c.com> Mingyue Zhao <zhao.mingyue@h3c.com>
-H3C <contact@h3c.com> Qiankun Zheng <zheng.qiankun@h3c.com>
-H3C <contact@h3c.com> Sangdi Xu <xu.sangdi@h3c.com>
-H3C <contact@h3c.com> Bo Cai <cai.bo@h3c.com>
-H3C <contact@h3c.com> Yue Zhu <zhu.yue@h3c.com>
-H3C <contact@h3c.com> Fei Wang <wang.fei@h3c.com>
-H3C <contact@h3c.com> Ni Dang <dang.ni@h3c.com>
-H3C <contact@h3c.com> Shan Li <li.shan@h3c.com>
-H3C <contact@h3c.com> Xiaofeng Feng <feng.xiaofeng@h3c.com>
-H3C <contact@h3c.com> Peiyang Liu <liu.peiyang@h3c.com>
-H3C <contact@h3c.com> Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
-H3C <contact@h3c.com> Ming Zou <zou.ming@h3c.com>
-H3C <contact@h3c.com> Bingxin Yang <yangbingxin@h3c.com>
-H3C <contact@h3c.com> Xiangwei Wu <wuxiangwei@h3c.com>
-H3C <contact@h3c.com> Jie Chen <chen.jie@h3c.com>
-H3C <contact@h3c.com> Jie Li <li.jieA@h3c.com>
-H3C <contact@h3c.com> Zhanyang Chen <Chen.zhanyang@h3c.com>
-H3C <contact@h3c.com> Yehua Chen <chen.yehua@h3c.com>
-H3C <contact@h3c.com> Siyuan Zhou <zhou.siyuan@h3c.com>
-H3C <contact@h3c.com> Qiang Guo <guo.qiang@h3c.com>
-H3C <contact@h3c.com> Yanbin Wu <Wu.yanbin@h3c.com>
-H3C <contact@h3c.com> Kongming Wu <wu.kongming@h3c.com>
-H3C <contact@h3c.com> Bin Zheng <zhengbin.08747@h3c.com>
-H3C <contact@h3c.com> Chunyan Ma <ma.chunyan@h3c.com>
-H3C <contact@h3c.com> Yongqiang He <he.yongqiang@h3c.com>
-H3C <contact@h3c.com> Xudong Cao <cao.xudong@h3c.com>
-H3C <contact@h3c.com> Yunhui Chen <chen.yunhui@h3c.com>
-H3C <contact@h3c.com> Tingting Chi <chitingting@h3c.com>
-H3C <contact@h3c.com> Wenfeng Wang <wang.wenfeng@h3c.com>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \