aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-10 20:42:53 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-10 20:42:53 -0500
commit506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch)
tree03de82e812f00957aa6276dac2fe51c3358e88d7 /CREDITS
parente1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts: include/linux/kernel_stat.h
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS27
1 files changed, 22 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index b50db1767554..939da46a87fb 100644
--- a/CREDITS
+++ b/CREDITS
@@ -369,10 +369,10 @@ P: 1024/8462A731 4C 55 86 34 44 59 A7 99 2B 97 88 4A 88 9A 0D 97
369D: sun4 port, Sparc hacker 369D: sun4 port, Sparc hacker
370 370
371N: Hugh Blemings 371N: Hugh Blemings
372E: hugh@misc.nu 372E: hugh@blemings.org
373W: http://misc.nu/hugh/ 373W: http://blemings.org/hugh
374D: Author and maintainer of the Keyspan USB to Serial drivers 374D: Original author of the Keyspan USB to serial drivers, random PowerPC hacker
375S: Po Box 234 375S: PO Box 234
376S: Belconnen ACT 2616 376S: Belconnen ACT 2616
377S: Australia 377S: Australia
378 378
@@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr.
464S: Nampa, Idaho 83686 464S: Nampa, Idaho 83686
465S: USA 465S: USA
466 466
467N: Dirk J. Brandewie
468E: dirk.j.brandewie@intel.com
469E: linux-wimax@intel.com
470D: Intel Wireless WiMAX Connection 2400 SDIO driver
471
467N: Derrick J. Brashear 472N: Derrick J. Brashear
468E: shadow@dementia.org 473E: shadow@dementia.org
469W: http://www.dementia.org/~shadow 474W: http://www.dementia.org/~shadow
@@ -1681,7 +1686,7 @@ E: ajoshi@shell.unixbox.com
1681D: fbdev hacking 1686D: fbdev hacking
1682 1687
1683N: Jesper Juhl 1688N: Jesper Juhl
1684E: jesper.juhl@gmail.com 1689E: jj@chaosbits.net
1685D: Various fixes, cleanups and minor features all over the tree. 1690D: Various fixes, cleanups and minor features all over the tree.
1686D: Wrote initial version of the hdaps driver (since passed on to others). 1691D: Wrote initial version of the hdaps driver (since passed on to others).
1687S: Lemnosvej 1, 3.tv 1692S: Lemnosvej 1, 3.tv
@@ -2119,6 +2124,11 @@ N: H.J. Lu
2119E: hjl@gnu.ai.mit.edu 2124E: hjl@gnu.ai.mit.edu
2120D: GCC + libraries hacker 2125D: GCC + libraries hacker
2121 2126
2127N: Yanir Lubetkin
2128E: yanirx.lubatkin@intel.com
2129E: linux-wimax@intel.com
2130D: Intel Wireless WiMAX Connection 2400 driver
2131
2122N: Michal Ludvig 2132N: Michal Ludvig
2123E: michal@logix.cz 2133E: michal@logix.cz
2124E: michal.ludvig@asterisk.co.nz 2134E: michal.ludvig@asterisk.co.nz
@@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road
2693S: Thunder Bay, Ontario 2703S: Thunder Bay, Ontario
2694S: CANADA P7C 5M9 2704S: CANADA P7C 5M9
2695 2705
2706N: Inaky Perez-Gonzalez
2707E: inaky.perez-gonzalez@intel.com
2708E: linux-wimax@intel.com
2709E: inakypg@yahoo.com
2710D: WiMAX stack
2711D: Intel Wireless WiMAX Connection 2400 driver
2712
2696N: Yuri Per 2713N: Yuri Per
2697E: yuri@pts.mipt.ru 2714E: yuri@pts.mipt.ru
2698D: Some smbfs fixes 2715D: Some smbfs fixes