diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /CREDITS | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/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 |