diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 13:57:44 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 13:57:44 -0800 |
commit | 376613e81ddc68f545fd5c87ffc3ad222b7abe5f (patch) | |
tree | e1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1 /security/tomoyo/condition.c | |
parent | 0db49b72bce26341274b74fd968501489a361ae3 (diff) | |
parent | 0518469d0a32be1e6dd8850ff274d52d72cdb52d (diff) |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, tsc: Skip TSC synchronization checks for tsc=reliable
clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
clocksource: cris: Convert to clocksource_register_khz
clocksource: xtensa: Convert to clocksource_register_hz/khz
clocksource: um: Convert to clocksource_register_hz/khz
clocksource: parisc: Convert to clocksource_register_hz/khz
clocksource: m86k: Convert to clocksource_register_hz/khz
time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver
time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
time: x86: Remove CLOCK_TICK_RATE from tsc code
time: Fix spelling mistakes in new comments
time: fix bogus comment in timekeeping_get_ns_raw
Diffstat (limited to 'security/tomoyo/condition.c')
0 files changed, 0 insertions, 0 deletions