diff options
| author |   Paul Mackerras <paulus@samba.org> | 2007-02-07 14:05:13 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 14:05:13 +1100 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /CREDITS | |
| parent | [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call (diff) | |
| parent | Linux 2.6.20 (diff) | |
| download | linux-dev-8423200553113cc031caa9b147f6150a8e26545c.tar.xz linux-dev-8423200553113cc031caa9b147f6150a8e26545c.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3279,7 +3279,7 @@ S: Sevilla 41005 S: Spain N: Linus Torvalds -E: torvalds@osdl.org +E: torvalds@linux-foundation.org D: Original kernel hacker S: 12725 SW Millikan Way, Suite 400 S: Beaverton, Oregon 97005 |