From 8d9fcbca8ed721b59fc864b1e48e94f844532ff0 Mon Sep 17 00:00:00 2001
From: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Date: Tue, 23 Sep 2014 17:36:07 +0530
Subject: [PATCH] mailmap: Casey Marshall affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
---
 .mailmap         | 1 +
 .organizationmap | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index d1fd6998311..b7038d52e89 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,6 +23,7 @@ Brian Rak <dn@devicenull.org> devicenull <dn@devicenull.org>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caleb.miles@inktank.com>
 Caleb Miles <caleb.miles@inktank.com> caleb miles <caselim@gmail.com>
 Caleb Miles <caleb.miles@inktank.com> Caleb Miles <caselim@gmail.com>
+Casey Marshall <csm@soe.ucsc.edu> rsdio <rsdio@29311d96-e01e-0410-9327-a35deaab8ce9>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
 Christian Brunner <christian@brunner-muc.de> <chb@muc.de> 
 Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
diff --git a/.organizationmap b/.organizationmap
index da27ce31003..ca64cdc9e7f 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -235,6 +235,7 @@ UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Carlos Maltzahn <carlosm@cs.ucsc.edu>
+University of California, Santa Cruz <contact@cs.ucsc.edu> Casey Marshall <csm@soe.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Feng Wang <cyclonew@cs.ucsc.edu>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Joe Buck <jbbuck@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Noah Watkins <noahwatkins@gmail.com>
-- 
2.47.3