summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2016-09-22 13:00:10 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2016-09-22 13:00:10 +1000
commitcd669b8e6673b4592d0dea015b5b56073641b650 (patch)
tree8785a4cfb400be3ed1db34371b8ff66ed451997d /CREDITS
parent91661d512b8b8160bf83c1123f0b45b789d49467 (diff)
parentbb1e41ba324fe4bb71be3ef8d0eda29f0ba44ffa (diff)
Merge remote-tracking branch 'battery/for-next'
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 7cf4e5606d0a..4b330862de2b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1090,6 +1090,10 @@ S: 6350 Stoneridge Mall Road
S: Pleasanton, CA 94588
S: USA
+N: Dmitry Eremin-Solenikov
+E: dbaryshkov@gmail.com
+D: Power Supply Maintainer from v3.14 - v3.15
+
N: Doug Evans
E: dje@cygnus.com
D: Wrote Xenix FS (part of standard kernel since 0.99.15)