diff options
author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /CREDITS | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) |
Merge from-linus to-akpm
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 |