diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-18 04:15:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-18 04:15:35 -0400 |
| commit | 1079cac0f4eb7d968395378b1625979d4c818dd6 (patch) | |
| tree | d261058d95d27fe7250511d5fad69db30dc17731 /include/linux/clocksource.h | |
| parent | 5872144f64b34a5942f6b4acedc90b02de72c58b (diff) | |
| parent | 1406de8e11eb043681297adf86d6892ff8efc27a (diff) | |
Merge commit 'v2.6.30-rc6' into tracing/core
Merge reason: we were on an -rc4 base, sync up to -rc6
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/clocksource.h')
0 files changed, 0 insertions, 0 deletions