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)
 - support CLOCK_BOOTTIME clock in timerfd
 - Add missing header file

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Trivial merge