diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 11:17:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 11:17:41 +0900 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /CREDITS | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
| download | kernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.gz kernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.xz kernel-crypto-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/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 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 |