From: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Date: Fri, 28 Oct 2016 00:46:53 +0000 (-0700)
Subject: CREDITS: update credit information for Martin Kepplinger
X-Git-Tag: v5.15~12570^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8f72cb4ef90c63bcb5111c2e3ec7ea2727eab2f8;p=mirror_ubuntu-kernels.git

CREDITS: update credit information for Martin Kepplinger

Content and employer changed.

Link: http://lkml.kernel.org/r/1477304102-28830-1-git-send-email-martin.kepplinger@ginzinger.com
Signed-off-by: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/CREDITS b/CREDITS
index 513aaa3546bf..837367624e45 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1864,10 +1864,11 @@ S: The Netherlands
 
 N: Martin Kepplinger
 E: martink@posteo.de
-E: martin.kepplinger@theobroma-systems.com
+E: martin.kepplinger@ginzinger.com
 W: http://www.martinkepplinger.com
 D: mma8452 accelerators iio driver
-D: Kernel cleanups
+D: pegasus_notetaker input driver
+D: Kernel fixes and cleanups
 S: Garnisonstraße 26
 S: 4020 Linz
 S: Austria