summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--AUTHORS1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 702cc6ca1..60ed30d3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@ Module.symvers
TAGS
cscope.*
tags
+_debian
diff --git a/AUTHORS b/AUTHORS
index bca47d5e8..d11c7c51c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ Leo Alterman lalterman@nicira.com
Linda Sun lsun@vmware.com
Lorand Jakab lojakab@cisco.com
Luca Giraudo lgiraudo@nicira.com
+Mark Hamilton mhamilton@nicira.com
Martin Casado casado@nicira.com
Mehak Mahajan mmahajan@nicira.com
Murphy McCauley murphy.mccauley@gmail.com