aboutsummaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorMartin Kepplinger <martin.kepplinger@ginzinger.com>2016-10-27 17:46:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-27 18:43:43 -0700
commit8f72cb4ef90c63bcb5111c2e3ec7ea2727eab2f8 (patch)
treecf161bb327f32e46bc1dc3995bb65772b590b070 /CREDITS
parent06b2849d103f4a91212876a211d0d7df227a9513 (diff)
downloadlinux-stericsson-8f72cb4ef90c63bcb5111c2e3ec7ea2727eab2f8.tar.gz
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>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS5
1 files changed, 3 insertions, 2 deletions
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