diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /CREDITS | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -3401,10 +3401,10 @@ S: Czech Republic | |||
| 3401 | 3401 | ||
| 3402 | N: Thibaut Varene | 3402 | N: Thibaut Varene |
| 3403 | E: T-Bone@parisc-linux.org | 3403 | E: T-Bone@parisc-linux.org |
| 3404 | W: http://www.parisc-linux.org/ | 3404 | W: http://www.parisc-linux.org/~varenet/ |
| 3405 | P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063 | 3405 | P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063 |
| 3406 | D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits | 3406 | D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits |
| 3407 | D: Some bits in an ARM port, S1D13XXX FB driver, random patches here and there | 3407 | D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there |
| 3408 | D: AD1889 sound driver | 3408 | D: AD1889 sound driver |
| 3409 | S: Paris, France | 3409 | S: Paris, France |
| 3410 | 3410 | ||