diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /CREDITS | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 10 |
1 files changed, 10 insertions, 0 deletions
| @@ -2571,6 +2571,16 @@ S: Subiaco, 6008 | |||
| 2571 | S: Perth, Western Australia | 2571 | S: Perth, Western Australia |
| 2572 | S: Australia | 2572 | S: Australia |
| 2573 | 2573 | ||
| 2574 | N: Miguel Ojeda Sandonis | ||
| 2575 | E: maxextreme@gmail.com | ||
| 2576 | D: Author: Auxiliary LCD Controller driver (ks0108) | ||
| 2577 | D: Author: Auxiliary LCD driver (cfag12864b) | ||
| 2578 | D: Author: Auxiliary LCD framebuffer driver (cfag12864bfb) | ||
| 2579 | D: Maintainer: Auxiliary display drivers tree (drivers/auxdisplay/*) | ||
| 2580 | S: C/ Mieses 20, 9-B | ||
| 2581 | S: Valladolid 47009 | ||
| 2582 | S: Spain | ||
| 2583 | |||
| 2574 | N: Greg Page | 2584 | N: Greg Page |
| 2575 | E: gpage@sovereign.org | 2585 | E: gpage@sovereign.org |
| 2576 | D: IPX development and support | 2586 | D: IPX development and support |