summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-11-24 05:09:08 +0100
committerIngo Molnar <mingo@kernel.org>2016-11-24 05:09:08 +0100
commit69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch)
tree3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /CREDITS
parent6a6b12e2125591e24891e6860410795ea53aed11 (diff)
parent10b9dd56860e93f11cd352e8c75a33357b80b70b (diff)
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.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