summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorIngo Molnar2015-05-19 08:37:30 +0200
committerIngo Molnar2015-05-19 08:37:30 +0200
commita22ae718067c233af790b8690b3d8f6190859ead (patch)
tree2e96c72b4b231f9302f0000a8702e4f21456e90b /CREDITS
parentsched: Fix function declaration return type mismatch (diff)
parentLinux 4.1-rc4 (diff)
downloadkernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.tar.gz
kernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.tar.xz
kernel-qcow2-linux-a22ae718067c233af790b8690b3d8f6190859ead.zip
Merge tag 'v4.1-rc4' into sched/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS7
1 files changed, 7 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 40cc4bfb34db..ec7e6c7fdd1b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3709,6 +3709,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group
+N: Andrew Victor
+E: linux@maxim.org.za
+W: http://maxim.org.za/at91_26.html
+D: First maintainer of Atmel ARM-based SoC, aka AT91
+D: Introduced support for at91rm9200, the first chip of AT91 family
+S: South Africa
+
N: Riku Voipio
E: riku.voipio@iki.fi
D: Author of PCA9532 LED and Fintek f75375s hwmon driver