diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-19 17:20:49 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-19 17:20:49 +1100 |
commit | 285b0c1f17695658040671fd490fa08b830e6e3a (patch) | |
tree | 95f18d9118ad6e6dc3801514d6daa18900615149 /CREDITS | |
parent | 6c03e929f06be2f886ffd90cfcfd3bfffb43b17d (diff) | |
parent | 3611f0abb13dde23afad9742f8a1b949f262bd12 (diff) |
Merge branch 'akpm-current/current'
Conflicts:
fs/fs-writeback.c
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1377,6 +1377,9 @@ S: 17 rue Danton S: F - 94270 Le Kremlin-BicĂȘtre S: France +N: Jack Hammer +D: IBM ServeRAID RAID (ips) driver maintenance + N: Greg Hankins E: gregh@cc.gatech.edu D: fixed keyboard driver to separate LED and locking status @@ -1687,6 +1690,10 @@ S: Reading S: RG6 2NU S: United Kingdom +N: Dave Jeffery +E: dhjeffery@gmail.com +D: SCSI hacks and IBM ServeRAID RAID driver maintenance + N: Jakub Jelinek E: jakub@redhat.com W: http://sunsite.mff.cuni.cz/~jj @@ -2571,6 +2578,10 @@ N: Wolfgang Muees E: wolfgang@iksw-muees.de D: Auerswald USB driver +N: Paul Mundt +E: paul.mundt@gmail.com +D: SuperH maintainer + N: Ian A. Murdock E: imurdock@gnu.ai.mit.edu D: Creator of Debian distribution |