| commit | 0ce74d9296c971b2355c26984ad0bc538e34dd6c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Dec 29 09:42:58 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Dec 29 10:37:07 2008 +0100 |
| tree | 566d03e2a4f6b42dab9628cd82c93cd61d587467 | |
| parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 [diff] | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 [diff] |
Merge branch 'linus' into timers/hrtimers
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c