Merge branch 'kconfig-for-40' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[pandora-kernel.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index d6585ab..a7ea8e3 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -328,7 +328,7 @@ S: Haifa, Israel
 N: Johannes Berg
 E: johannes@sipsolutions.net
 W: http://johannes.sipsolutions.net/
 N: Johannes Berg
 E: johannes@sipsolutions.net
 W: http://johannes.sipsolutions.net/

-P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
+P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A

 D: powerpc & 802.11 hacker
 
 N: Stephen R. van den Berg (AKA BuGless)
 D: powerpc & 802.11 hacker
 
 N: Stephen R. van den Berg (AKA BuGless)


@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
 D: Assorted VIA x86 support.
 D: 2.5 AGPGART overhaul.
 D: CPUFREQ maintenance.
 D: Assorted VIA x86 support.
 D: 2.5 AGPGART overhaul.
 D: CPUFREQ maintenance.

-D: Fedora kernel maintainence.
+D: Fedora kernel maintenance.

 D: Misc/Other.
 S: 314 Littleton Rd, Westford, MA 01886, USA
 
 D: Misc/Other.
 S: 314 Littleton Rd, Westford, MA 01886, USA
 


@@ -2943,6 +2943,10 @@ S: Kasarmikatu 11 A4
 S: 70110 Kuopio
 S: Finland
 
 S: 70110 Kuopio
 S: Finland
 

+N: Tobias Ringström
+E: tori@unhappy.mine.nu
+D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver
+

 N: Luca Risolia
 E: luca.risolia@studio.unibo.it
 P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4
 N: Luca Risolia
 E: luca.risolia@studio.unibo.it
 P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4


@@ -3211,7 +3215,7 @@ N: James Simmons
 E: jsimmons@infradead.org
 E: jsimmons@users.sf.net 
 D: Frame buffer device maintainer
 E: jsimmons@infradead.org
 E: jsimmons@users.sf.net 
 D: Frame buffer device maintainer

-D: input layer developement 
+D: input layer development

 D: tty/console layer
 D: various mipsel devices 
 S: 115 Carmel Avenue 
 D: tty/console layer
 D: various mipsel devices 
 S: 115 Carmel Avenue 


@@ -3290,7 +3294,7 @@ S: USA
 N: Manfred Spraul
 E: manfred@colorfullife.com
 W: http://www.colorfullife.com/~manfred
 N: Manfred Spraul
 E: manfred@colorfullife.com
 W: http://www.colorfullife.com/~manfred

-D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
+D: Lots of tiny hacks. Larger improvements to SysV IPC msg,

 D: slab, pipe, select.
 S: 71701 Schwieberdingen
 S: Germany
 D: slab, pipe, select.
 S: 71701 Schwieberdingen
 S: Germany