diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-21 00:40:00 -0400 |
| commit | 646352319b6cd369750a706706810d87f6b6efa7 (patch) | |
| tree | e7830e1276cbad7d29bf9471def4b8940592c3b7 /CREDITS | |
| parent | d3485d37c0b3292aec0618b6663c57542df5da99 (diff) | |
| parent | f6fdd7d9c273bb2a20ab467cb57067494f932fa3 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 3 |
1 files changed, 1 insertions, 2 deletions
| @@ -2423,8 +2423,7 @@ S: Toronto, Ontario | |||
| 2423 | S: Canada | 2423 | S: Canada |
| 2424 | 2424 | ||
| 2425 | N: Zwane Mwaikambo | 2425 | N: Zwane Mwaikambo |
| 2426 | E: zwane@linuxpower.ca | 2426 | E: zwane@arm.linux.org.uk |
| 2427 | W: http://function.linuxpower.ca | ||
| 2428 | D: Various driver hacking | 2427 | D: Various driver hacking |
| 2429 | D: Lowlevel x86 kernel hacking | 2428 | D: Lowlevel x86 kernel hacking |
| 2430 | D: General debugging | 2429 | D: General debugging |