X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=CREDITS;h=6bd8ab86b5bd1b80f2df2ceaf0a4f8d7634639a0;hb=bc4809e939b91c9642f1ddaea732e2d432ee6af6;hp=75c5ce82720c97ac4a2bd2f5c445386be64f6a20;hpb=72836708c6218d91db982ae48c5c62293e78ed7c;p=linux-2.6

diff --git a/CREDITS b/CREDITS
index 75c5ce8272..6bd8ab86b5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2571,6 +2571,16 @@ S: Subiaco, 6008
 S: Perth, Western Australia
 S: Australia
 
+N: Miguel Ojeda Sandonis
+E: maxextreme@gmail.com
+D: Author: Auxiliary LCD Controller driver (ks0108)
+D: Author: Auxiliary LCD driver (cfag12864b)
+D: Author: Auxiliary LCD framebuffer driver (cfag12864bfb)
+D: Maintainer: Auxiliary display drivers tree (drivers/auxdisplay/*)
+S: C/ Mieses 20, 9-B
+S: Valladolid 47009
+S: Spain
+
 N: Greg Page
 E: gpage@sovereign.org
 D: IPX development and support
@@ -2668,7 +2678,7 @@ S: Ottawa, Ontario
 S: Canada K2P 0X8
 
 N: Mikael Pettersson
-E: mikpe@csd.uu.se
+E: mikpe@it.uu.se
 W: http://www.csd.uu.se/~mikpe/
 D: Miscellaneous fixes
 
@@ -3279,7 +3289,7 @@ S: Sevilla 41005
 S: Spain
 
 N: Linus Torvalds
-E: torvalds@osdl.org
+E: torvalds@linux-foundation.org
 D: Original kernel hacker
 S: 12725 SW Millikan Way, Suite 400
 S: Beaverton, Oregon 97005