aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2019-12-16 09:08:51 +0100
committerGreg Kroah-Hartman2019-12-16 09:08:51 +0100
commit94e14da890b1b68526b5f87ff1c97f374fd2471e (patch)
treead17c794208b02cd2ae24d67ab7e9c14c2fd43c5 /.mailmap
parent5367601b52696004f363e4f6c0b228b5bbf7d8b7 (diff)
parentd1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff)
Merge 5.5-rc2 into driver-core-next
We need the driver core fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c24773db04a7..00581c1f0983 100644
--- a/.mailmap
+++ b/.mailmap
@@ -276,3 +276,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
Gustavo Padovan <padovan@profusion.mobi>
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
+Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
+Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>