diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 02:09:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 02:09:26 -0400 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /CREDITS | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 3 |
1 files changed, 1 insertions, 2 deletions
| @@ -3344,8 +3344,7 @@ S: Spain | |||
| 3344 | N: Linus Torvalds | 3344 | N: Linus Torvalds |
| 3345 | E: torvalds@linux-foundation.org | 3345 | E: torvalds@linux-foundation.org |
| 3346 | D: Original kernel hacker | 3346 | D: Original kernel hacker |
| 3347 | S: 12725 SW Millikan Way, Suite 400 | 3347 | S: Portland, Oregon 97005 |
| 3348 | S: Beaverton, Oregon 97005 | ||
| 3349 | S: USA | 3348 | S: USA |
| 3350 | 3349 | ||
| 3351 | N: Marcelo Tosatti | 3350 | N: Marcelo Tosatti |