diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /CREDITS | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -2611,8 +2611,9 @@ S: Perth, Western Australia | |||
| 2611 | S: Australia | 2611 | S: Australia |
| 2612 | 2612 | ||
| 2613 | N: Miguel Ojeda Sandonis | 2613 | N: Miguel Ojeda Sandonis |
| 2614 | E: maxextreme@gmail.com | 2614 | E: miguel.ojeda.sandonis@gmail.com |
| 2615 | W: http://maxextreme.googlepages.com/ | 2615 | W: http://miguelojeda.es |
| 2616 | W: http://jair.lab.fi.uva.es/~migojed/ | ||
| 2616 | D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. | 2617 | D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers. |
| 2617 | D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) | 2618 | D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*) |
| 2618 | S: C/ Mieses 20, 9-B | 2619 | S: C/ Mieses 20, 9-B |