diff options
author | Len Brown <len.brown@intel.com> | 2005-08-24 06:12:23 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-24 06:12:23 +0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /CREDITS | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
download | linux-84ffa747520edd4556b136bdfc9df9eb1673ce12.tar.xz |
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 S: Canada N: Zwane Mwaikambo -E: zwane@linuxpower.ca -W: http://function.linuxpower.ca +E: zwane@arm.linux.org.uk D: Various driver hacking D: Lowlevel x86 kernel hacking D: General debugging |