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