summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:07:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-14 07:07:36 +0200
commit27d6e47f8e133167af51a3e39548cd3e9bed07da (patch)
tree069abe69fc8e247ef9ca4443afc11d04aa1e723c /CREDITS
parent9dc86c234e845a5f60c5af013e647795c784df87 (diff)
parent4f5cafb5cb8471e54afdc9054d973535614f7675 (diff)
Merge 5.4-rc3 into staging-next
We want the staging driver fixes in here as well to build on and test with. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 8b67a85844b5..031605d46b4d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18
S: D-69126 Heidelberg
S: Germany
+N: Simon Horman
+M: horms@verge.net.au
+D: Renesas ARM/ARM64 SoC maintainer
+
N: Christopher Horn
E: chorn@warwick.net
D: Miscellaneous sysctl hacks