diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 12:54:00 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-19 12:54:00 +0200 |
| commit | 7063e6c717f6108c4b3fc3135a516c86ef944870 (patch) | |
| tree | ec6eec10b4dc93474100e6e366df028bd3314fda /CREDITS | |
| parent | AUDIT: Quis Custodiet Ipsos Custodes? (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/d... (diff) | |
| download | linux-7063e6c717f6108c4b3fc3135a516c86ef944870.tar.xz linux-7063e6c717f6108c4b3fc3135a516c86ef944870.zip | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -882,13 +882,12 @@ S: Blacksburg, Virginia 24061 S: USA N: Randy Dunlap -E: rddunlap@osdl.org +E: rdunlap@xenotime.net W: http://www.xenotime.net/linux/linux.html W: http://www.linux-usb.org D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers D: x86 SMP, ACPI, bootflag hacking -S: 12725 SW Millikan Way, Suite 400 -S: Beaverton, Oregon 97005 +S: (ask for current address) S: USA N: Bob Dunlop |