aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-07-28 04:30:20 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-07-28 04:30:20 -0400
commit661299d9d0437a0ff72240f3d60016ac3a361a6e (patch)
tree765512576314fc3612b503f182b9ae4e60fcf849 /CREDITS
parent05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff)
parent41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff)
Merge with Linus' 2.6 tree
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 3b7a1548aaf9..d97e62524ddc 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com
1624D: fbdev hacking 1624D: fbdev hacking
1625 1625
1626N: Jesper Juhl 1626N: Jesper Juhl
1627E: juhl-lkml@dif.dk 1627E: jesper.juhl@gmail.com
1628D: Various small janitor fixes, cleanups etc. 1628D: Various fixes, cleanups and minor features.
1629S: Lemnosvej 1, 3.tv 1629S: Lemnosvej 1, 3.tv
1630S: 2300 Copenhagen S 1630S: 2300 Copenhagen S.
1631S: Denmark 1631S: Denmark
1632 1632
1633N: Jozsef Kadlecsik 1633N: Jozsef Kadlecsik