Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata...

[mv-sheeva.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index c9068febcffcd0d111dbf0771f5a09b149be7012..3b9e160d6f7efe52898700a41b923df2c5581413 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -339,7 +339,7 @@ W: http://tomas.nocrew.org/
 D: dsp56k device driver
 
 N: Ross Biro
-E: bir7@leland.Stanford.Edu
+E: ross.biro@gmail.com
 D: Original author of the Linux networking code
 
 N: Anton Blanchard