Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/linux...
authorThomas Gleixner <tglx@linutronix.de>
Sat, 24 May 2014 00:05:51 +0000 (02:05 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 24 May 2014 00:05:51 +0000 (02:05 +0200)
* Remove the deprecated setup_sched_clock() API
* Minor NTP updates


Trivial merge