diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /Documentation/usb/CREDITS | |
| parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Documentation/usb/CREDITS')
| -rw-r--r-- | Documentation/usb/CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/usb/CREDITS b/Documentation/usb/CREDITS index 01e7f857ef35..27a721635f92 100644 --- a/Documentation/usb/CREDITS +++ b/Documentation/usb/CREDITS | |||
| @@ -21,7 +21,7 @@ difficult to maintain, add yourself with a patch if desired. | |||
| 21 | Bill Ryder <bryder@sgi.com> | 21 | Bill Ryder <bryder@sgi.com> |
| 22 | Thomas Sailer <sailer@ife.ee.ethz.ch> | 22 | Thomas Sailer <sailer@ife.ee.ethz.ch> |
| 23 | Gregory P. Smith <greg@electricrain.com> | 23 | Gregory P. Smith <greg@electricrain.com> |
| 24 | Linus Torvalds <torvalds@osdl.org> | 24 | Linus Torvalds <torvalds@linux-foundation.org> |
| 25 | Roman Weissgaerber <weissg@vienna.at> | 25 | Roman Weissgaerber <weissg@vienna.at> |
| 26 | <Kazuki.Yasumatsu@fujixerox.co.jp> | 26 | <Kazuki.Yasumatsu@fujixerox.co.jp> |
| 27 | 27 | ||