diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-12 02:14:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-12 02:14:03 -0800 |
| commit | c5a379cdb48cf7f77195e2f714c3239fc895c12c (patch) | |
| tree | e2212bc36189d9051ccf1b2c0389002c810465b2 /CREDITS | |
| parent | f95e6dae6522e0c403bef92405a3577ebd8baee9 (diff) | |
| parent | 8aaf5f19fd6ada03688a6c465c75eb80f285ebad (diff) | |
| download | history-c5a379cdb48cf7f77195e2f714c3239fc895c12c.tar.gz | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2936,10 +2936,10 @@ S: 03600 Karkkila S: Finland N: Deepak Saxena -E: deepak@csociety.purdue.edu +E: dsaxena@plexity.net D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO -D: XScale(IOP310) porting -S: Tempe, Arizona +D: XScale(IOP, IXP) porting and other random ARM bits +S: Portland, OR N: Eric Schenk E: Eric.Schenk@dna.lth.se |