aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-08-01 22:19:16 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-08-01 22:19:16 -0700
commit6f842b91d51d9e86923ecf4ab7db7962b75c6512 (patch)
tree9b955debe164a72699619e829481f7159c4c2990 /CREDITS
parentd52a86beef07ed85f79d03cd2e58027d3ccfb506 (diff)
parent4945fd78c9d0e2142f014ab8ab942d7fbae95128 (diff)
downloadhistory-6f842b91d51d9e86923ecf4ab7db7962b75c6512.tar.gz
Merge http://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 861f92e9c4f629..12c3b9fc19f7a9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2190,7 +2190,7 @@ S: Fullarton 5063
S: South Australia
N. Wolfgang Muees
-E: wmues@nexgo.de
+E: wolfgang@iksw-muees.de
D: Auerswald USB driver
N: Ian A. Murdock