aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--arch/mips/generic/kexec.c2
-rw-r--r--arch/mips/kernel/probes-common.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 987c5c9ad6c6..4757d361fd33 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
102Linas Vepstas <linas@austin.ibm.com> 102Linas Vepstas <linas@austin.ibm.com>
103Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 103Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
104Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> 104Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
105Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
105Mark Brown <broonie@sirena.org.uk> 106Mark Brown <broonie@sirena.org.uk>
106Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com> 107Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
107Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com> 108Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
diff --git a/arch/mips/generic/kexec.c b/arch/mips/generic/kexec.c
index e9fb735299e3..1ca409f58929 100644
--- a/arch/mips/generic/kexec.c
+++ b/arch/mips/generic/kexec.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * Copyright (C) 2016 Imagination Technologies 2 * Copyright (C) 2016 Imagination Technologies
3 * Author: Marcin Nowakowski <marcin.nowakowski@imgtec.com> 3 * Author: Marcin Nowakowski <marcin.nowakowski@mips.com>
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License as published by the 6 * under the terms of the GNU General Public License as published by the
diff --git a/arch/mips/kernel/probes-common.h b/arch/mips/kernel/probes-common.h
index dd08e41134b6..d2bf77b18822 100644
--- a/arch/mips/kernel/probes-common.h
+++ b/arch/mips/kernel/probes-common.h
@@ -1,6 +1,6 @@
1/* 1/*
2 * Copyright (C) 2016 Imagination Technologies 2 * Copyright (C) 2016 Imagination Technologies
3 * Author: Marcin Nowakowski <marcin.nowakowski@imgtec.com> 3 * Author: Marcin Nowakowski <marcin.nowakowski@mips.com>
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License as published by the 6 * under the terms of the GNU General Public License as published by the