aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-30 23:45:41 -0400
commit1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch)
tree64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /CREDITS
parentaebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff)
parent1bdfd554be94def718323659173517c5d4a69d25 (diff)
Merge branch 'master' into upstream
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 4 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index cc3453a55f..66e82466dd 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1620,7 +1620,8 @@ D: fbdev hacking
1620 1620
1621N: Jesper Juhl 1621N: Jesper Juhl
1622E: jesper.juhl@gmail.com 1622E: jesper.juhl@gmail.com
1623D: Various fixes, cleanups and minor features. 1623D: Various fixes, cleanups and minor features all over the tree.
1624D: Wrote initial version of the hdaps driver (since passed on to others).
1624S: Lemnosvej 1, 3.tv 1625S: Lemnosvej 1, 3.tv
1625S: 2300 Copenhagen S. 1626S: 2300 Copenhagen S.
1626S: Denmark 1627S: Denmark
@@ -2477,7 +2478,8 @@ S: Derbyshire DE4 3RL
2477S: United Kingdom 2478S: United Kingdom
2478 2479
2479N: Ian S. Nelson 2480N: Ian S. Nelson
2480E: ian.nelson@echostar.com 2481E: nelsonis@earthlink.net
2482P: 1024D/00D3D983 3EFD 7B86 B888 D7E2 29B6 9E97 576F 1B97 00D3 D983
2481D: Minor mmap and ide hacks 2483D: Minor mmap and ide hacks
2482S: 1370 Atlantis Ave. 2484S: 1370 Atlantis Ave.
2483S: Lafayette CO, 80026 2485S: Lafayette CO, 80026