diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 09:59:37 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-10 12:20:42 (GMT) |
| commit | dbb6be6d5e974c42bbecd183effaa0df69e1dd8b (patch) | |
| tree | 5735cb47e70853d057a9881dd0ce44b83e88fa63 /kernel/time/clocksource.c | |
| parent | 6a867a395558a7f882d041783e4cdea6744ca2bf (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
| download | linux-fsl-qoriq-dbb6be6d5e974c42bbecd183effaa0df69e1dd8b.tar.xz | |
Merge branch 'linus' into timers/core
Reason: Further posix_cpu_timer patches depend on mainline changes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/clocksource.c')
0 files changed, 0 insertions, 0 deletions