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 /mm/slab_common.c | |
parent | 38edbb0b913d73713c23dcc742669f7e78b52aa7 (diff) | |
parent | 64e8d20bd39b81994d9cd60e7b42f8ec8652f5af (diff) |
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 'mm/slab_common.c')
0 files changed, 0 insertions, 0 deletions