summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-05-05 11:04:14 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2011-05-05 11:04:14 +1000
commit6dece6c8fef81ae0ab4bbd37c609fa73d4260fd3 (patch)
tree1d3b658e76446528e5592a5ca239bcd684b3b07c /CREDITS
parentd503ceac8fdcd24950ee5fa81d2ad58ba91c36aa (diff)
parent5efc1a7a6544491a8a4df8dcbff45a041600e429 (diff)
Merge remote-tracking branch 'kbuild/for-next'
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 4 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index dca6abcead6b..d524174f5a28 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3913,6 +3913,10 @@ S: Flandernstrasse 101
S: D-73732 Esslingen
S: Germany
+N: Roman Zippel
+E: zippel@linux-m68k.org
+D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5
+
N: Leonard N. Zubkoff
W: http://www.dandelion.com/Linux/
D: BusLogic SCSI driver