Merge branch 'fortglx/3.15/time' of git://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 10 Mar 2014 18:53:09 +0000 (19:53 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 10 Mar 2014 18:53:09 +0000 (19:53 +0100)
commitf9a8a0abc3138a623895dcb6c2575ca31ca3da34
tree0c02144a1eb71dda90aa8f65cab6c216db72c44d
parent38edbb0b913d73713c23dcc742669f7e78b52aa7
parent64e8d20bd39b81994d9cd60e7b42f8ec8652f5af
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>