From 1fe3d20291b339101d8931a15816add1ea85beef Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 21 Feb 2020 11:47:59 +0100
Subject: AUTHORS: update

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 .mailmap | 1 +
 AUTHORS  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 1ff4ce4..358a3c9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
 Jon Schipp <jonschipp@gmail.com>
+Michael R Torres <mic.ric.tor@gmail.com> <6692889+micrictor@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index dfe0f17..6ecd130 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ commits in the netsniff-ng repository:
  * Markus Amend <markus.amend@telekom.de>
  * Martin Hauke <mardnh@gmx.de>
  * Matteo Croce <mcroce@redhat.com>
+ * Michael R Torres <mic.ric.tor@gmail.com>
  * Michał Purzyński <michalpurzynski1@gmail.com>
  * Nick Grauel <nicolas.grauel@plexxi.com>
  * Oliver Smith <oliver@zerolag.com>
-- 
cgit v1.2.3-54-g00ecf

type='hidden' name='id' value='d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/arch/m68k/lib/lshrdi3.c'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/arch/m68k/lib/lshrdi3.c'>
<input type='hidden' name='id' value='d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>arch</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/m68k?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>m68k</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/m68k/lib?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>lib</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>lshrdi3.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</td><td class='right'>2014-11-08 19:19:07 +0100</td></tr>
<tr><th>committer</th><td>Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;</td><td class='right'>2015-03-15 10:23:30 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>d6410efad2e49e2cefc2a0e7236824fd12d5bd6e</a> (<a href='/cgit.cgi/linux/net-next.git/patch/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>d0942fba6486e4cd1e61c199582fb8320c559874</a> /<a href='/cgit.cgi/linux/net-next.git/tree/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>arch/m68k/lib/lshrdi3.c</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/arch/m68k/lib/lshrdi3.c?id=9eccca0843205f87c00404b663188b88eb248051'>9eccca0843205f87c00404b663188b88eb248051</a> (<a href='/cgit.cgi/linux/net-next.git/diff/arch/m68k/lib/lshrdi3.c?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e&amp;id2=9eccca0843205f87c00404b663188b88eb248051'>diff</a>)</td></tr></table>
<div class='commit-subject'>m68k: Remove FSF address</div><div class='commit-msg'>We have a central copy of the GPL for that, and the FSF may change
address again in the future.

Signed-off-by: Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=d6410efad2e49e2cefc2a0e7236824fd12d5bd6e'>Diffstat</a> (limited to 'arch/m68k/lib/lshrdi3.c')</div><table summary='diffstat' class='diffstat'>