summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-27 12:56:49 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-01-27 12:56:49 +0300
commitff7a672f83b355365478a1fdfb60933ef34d8d02 (patch)
tree567cc291244e8922502072962e90ff820d82a0a2 /.mailmap
parentcea79e7e2f24125b895bbfcdf98c8cfd1fb684d1 (diff)
parentbe91c44288bea4d48d64604e9073801383776623 (diff)
downloadlinux-ff7a672f83b355365478a1fdfb60933ef34d8d02.tar.xz
Merge branch 'acpica'
* acpica: ACPICA: Update version to 20200110 ACPICA: All acpica: Update copyrights to 2020 Including tool signons. ACPICA: Update the list of maintainers ACPICA: Update version to 20191213 ACPICA: Dispatcher: always generate buffer objects for ASL create_field() operator ACPICA: acpisrc: add unix line ending support for non-windows build ACPICA: Disassembler: create buffer fields in ACPI_PARSE_LOAD_PASS1 ACPICA: debugger: fix spelling mistake "adress" -> "address"
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index a7bc8cabd157..88e561b6c817 100644
--- a/.mailmap
+++ b/.mailmap
@@ -74,6 +74,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
Domen Puncer <domen@coderock.org>
Douglas Gilbert <dougg@torque.net>
Ed L. Cashin <ecashin@coraid.com>
+Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Felipe W Damasio <felipewd@terra.com.br>
Felix Kuhling <fxkuehl@gmx.de>