diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /CREDITS | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 10 |
1 files changed, 5 insertions, 5 deletions
| @@ -2212,13 +2212,13 @@ S: 2300 Copenhagen S | |||
| 2212 | S: Denmark | 2212 | S: Denmark |
| 2213 | 2213 | ||
| 2214 | N: Claudio S. Matsuoka | 2214 | N: Claudio S. Matsuoka |
| 2215 | E: claudio@conectiva.com | 2215 | E: cmatsuoka@gmail.com |
| 2216 | E: claudio@helllabs.org | 2216 | E: claudio@mandriva.com |
| 2217 | W: http://helllabs.org/~claudio | 2217 | W: http://helllabs.org/~claudio |
| 2218 | D: V4L, OV511 driver hacks | 2218 | D: V4L, OV511 and HDA-codec hacks |
| 2219 | S: Conectiva S.A. | 2219 | S: Conectiva S.A. |
| 2220 | S: R. Tocantins 89 | 2220 | S: Souza Naves 1250 |
| 2221 | S: 80050-430 Curitiba PR | 2221 | S: 80050-040 Curitiba PR |
| 2222 | S: Brazil | 2222 | S: Brazil |
| 2223 | 2223 | ||
| 2224 | N: Heinz Mauelshagen | 2224 | N: Heinz Mauelshagen |