diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /CREDITS | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -3382,7 +3382,7 @@ S: Germany | |||
| 3382 | 3382 | ||
| 3383 | N: Geert Uytterhoeven | 3383 | N: Geert Uytterhoeven |
| 3384 | E: geert@linux-m68k.org | 3384 | E: geert@linux-m68k.org |
| 3385 | W: http://home.tvd.be/cr26864/ | 3385 | W: http://users.telenet.be/geertu/ |
| 3386 | P: 1024/862678A6 C51D 361C 0BD1 4C90 B275 C553 6EEA 11BA 8626 78A6 | 3386 | P: 1024/862678A6 C51D 361C 0BD1 4C90 B275 C553 6EEA 11BA 8626 78A6 |
| 3387 | D: m68k/Amiga and PPC/CHRP Longtrail coordinator | 3387 | D: m68k/Amiga and PPC/CHRP Longtrail coordinator |
| 3388 | D: Frame buffer device and XF68_FBDev maintainer | 3388 | D: Frame buffer device and XF68_FBDev maintainer |
| @@ -3392,8 +3392,8 @@ D: Amiga Buddha and Catweasel chipset IDE | |||
| 3392 | D: Atari Falcon chipset IDE | 3392 | D: Atari Falcon chipset IDE |
| 3393 | D: Amiga Gayle chipset IDE | 3393 | D: Amiga Gayle chipset IDE |
| 3394 | D: mipsel NEC DDB Vrc-5074 | 3394 | D: mipsel NEC DDB Vrc-5074 |
| 3395 | S: Emiel Vlieberghlaan 2A/21 | 3395 | S: Haterbeekstraat 55B |
| 3396 | S: B-3010 Kessel-Lo | 3396 | S: B-3200 Aarschot |
| 3397 | S: Belgium | 3397 | S: Belgium |
| 3398 | 3398 | ||
| 3399 | N: Chris Vance | 3399 | N: Chris Vance |