diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-03-10 19:53:09 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-10 19:53:09 +0100 |
commit | f9a8a0abc3138a623895dcb6c2575ca31ca3da34 (patch) | |
tree | 0c02144a1eb71dda90aa8f65cab6c216db72c44d /drivers/clocksource | |
parent | timer: Make sure TIMER_FLAG_MASK bits are free in allocated base (diff) | |
parent | kernel: Include appropriate header file in time/timekeeping_debug.c (diff) | |
download | linux-f9a8a0abc3138a623895dcb6c2575ca31ca3da34.tar.xz linux-f9a8a0abc3138a623895dcb6c2575ca31ca3da34.zip |
Merge branch 'fortglx/3.15/time' of git://git.linaro.org/people/john.stultz/linux into timers/core
- support CLOCK_BOOTTIME clock in timerfd
- Add missing header file
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/clocksource')
0 files changed, 0 insertions, 0 deletions