summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 13:43:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 13:43:43 +0300
commitbb41d2a51f0ed379cbe6b2f73271688784c40a1a (patch)
tree8c414a77b6977e23fdefad009f72f97ae9d33e14 /CREDITS
parent4bdb35506b89cbbd150c1baa284e7c191698241f (diff)
parenta909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff)
downloadlinux-bb41d2a51f0ed379cbe6b2f73271688784c40a1a.tar.xz
Merge 4.9-rc3 into driver-core-next
We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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