diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-11 07:45:22 -0400 |
| commit | 4e83998f5af010a928495988c586ea2926624db9 (patch) | |
| tree | e72d346172a30bbee165d7f585784724906da416 /CREDITS | |
| parent | dd1d3a49db4ae5c6afffadaff526b96c7993c7dd (diff) | |
| parent | d4cfa4d12f46e2520f4c1d1a92e891ce068b7464 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -3554,12 +3554,12 @@ E: cvance@nai.com | |||
| 3554 | D: portions of the Linux Security Module (LSM) framework and security modules | 3554 | D: portions of the Linux Security Module (LSM) framework and security modules |
| 3555 | 3555 | ||
| 3556 | N: Petr Vandrovec | 3556 | N: Petr Vandrovec |
| 3557 | E: vandrove@vc.cvut.cz | 3557 | E: petr@vandrovec.name |
| 3558 | D: Small contributions to ncpfs | 3558 | D: Small contributions to ncpfs |
| 3559 | D: Matrox framebuffer driver | 3559 | D: Matrox framebuffer driver |
| 3560 | S: Chudenicka 8 | 3560 | S: 21513 Conradia Ct |
| 3561 | S: 10200 Prague 10, Hostivar | 3561 | S: Cupertino, CA 95014 |
| 3562 | S: Czech Republic | 3562 | S: USA |
| 3563 | 3563 | ||
| 3564 | N: Thibaut Varene | 3564 | N: Thibaut Varene |
| 3565 | E: T-Bone@parisc-linux.org | 3565 | E: T-Bone@parisc-linux.org |