Merge branch 'mainstream'

[sliver-openvswitch.git] / AUTHORS

diff --git a/AUTHORS b/AUTHORS
index d416160..63c1ef8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,7 +45,7 @@ Ian Campbell            Ian.Campbell@citrix.com
 Isaku Yamahata          yamahata@valinux.co.jp
 James P.                roampune@gmail.com
 James Page              james.page@ubuntu.com
-Jarno Rajahalme         jarno.rajahalme@nsn.com
+Jarno Rajahalme         jrajahalme@nicira.com
 Jean Tourrilhes         jt@hpl.hp.com
 Jeremy Stribling        strib@nicira.com
 Jesse Gross             jesse@nicira.com
@@ -215,6 +215,7 @@ Stephen Hemminger       shemminger@vyatta.com
 Takayuki HAMA           t-hama@cb.jp.nec.com
 Teemu Koponen           koponen@nicira.com
 Timothy Chen            tchen@nicira.com
+Torbjorn Tornkvist      kruskakli@gmail.com
 Valentin Bud            valentin@hackaserver.com
 Vishal Swarankar        vishal.swarnkar@gmail.com
 Vjekoslav Brajkovic     balkan@cs.washington.edu
@@ -223,6 +224,7 @@ YAMAMOTO Takashi        yamamoto@valinux.co.jp
 Yeming Zhao             zhaoyeming@gmail.com
 Ying Chen               yingchen@vmware.com
 Yongqiang Liu           liuyq7809@gmail.com
+ankur dwivedi           ankurengg2003@gmail.com
 kk yap                  yapkke@stanford.edu
 likunyun                kunyunli@hotmail.com
 rahim entezari          rahim.entezari@gmail.com