aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-02 18:22:11 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-02 18:22:11 -0400
commitcd02938a828f4b2098a074afb7454f106f2e8df5 (patch)
tree7b543fd6aa82a62dc3a9614c26f89daca83e77d5 /CREDITS
parent9d681f3a1b27fdfc17ea251cf8d5f627dab34670 (diff)
parent172ef275444efa12d834fb9d1b1acdac92db47f7 (diff)
Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS9
1 files changed, 9 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index e8b7d36611e5..9a93e3e26d70 100644
--- a/CREDITS
+++ b/CREDITS
@@ -495,6 +495,11 @@ S: Kopmansg 2
495S: 411 13 Goteborg 495S: 411 13 Goteborg
496S: Sweden 496S: Sweden
497 497
498N: Paul Bristow
499E: paul@paulbristow.net
500W: http://paulbristow.net/linux/idefloppy.html
501D: Maintainer of IDE/ATAPI floppy driver
502
498N: Dominik Brodowski 503N: Dominik Brodowski
499E: linux@brodo.de 504E: linux@brodo.de
500W: http://www.brodo.de/ 505W: http://www.brodo.de/
@@ -2642,6 +2647,10 @@ S: C/ Mieses 20, 9-B
2642S: Valladolid 47009 2647S: Valladolid 47009
2643S: Spain 2648S: Spain
2644 2649
2650N: Gadi Oxman
2651E: gadio@netvision.net.il
2652D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
2653
2645N: Greg Page 2654N: Greg Page
2646E: gpage@sovereign.org 2655E: gpage@sovereign.org
2647D: IPX development and support 2656D: IPX development and support