X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=CREDITS;h=9a93e3e26d700c757baaac7a851eb3da2bff68ab;hb=f64f30071843080a361ede71004a0eb427d6c508;hp=5e0736722afd547659c491ad2ee503e57336435d;hpb=9a38e989b8ce04923f919fc2a8a24eb07fb484e2;p=linux-2.6-omap-h63xx.git

diff --git a/CREDITS b/CREDITS
index 5e0736722af..9a93e3e26d7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -495,6 +495,11 @@ S: Kopmansg 2
 S: 411 13  Goteborg
 S: Sweden
 
+N: Paul Bristow
+E: paul@paulbristow.net
+W: http://paulbristow.net/linux/idefloppy.html
+D: Maintainer of IDE/ATAPI floppy driver
+
 N: Dominik Brodowski
 E: linux@brodo.de
 W: http://www.brodo.de/
@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B
 S: Valladolid 47009
 S: Spain
 
+N: Gadi Oxman
+E: gadio@netvision.net.il
+D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
+
 N: Greg Page
 E: gpage@sovereign.org
 D: IPX development and support
@@ -3738,7 +3747,7 @@ S: 93149 Nittenau
 S: Germany
 
 N: Gertjan van Wingerde
-E: gwingerde@home.nl
+E: gwingerde@gmail.com
 D: Ralink rt2x00 WLAN driver
 D: Minix V2 file-system
 D: Misc fixes