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)
commit309179fabddd074f7da63c5602bc32cb6de677f9
treeddefd2f4b14df480070ee416fcc53f6b82ec7b35
parent2779ac167b1a1bf8153dca9f3a141c6148c6b89f
parentea54bca3aab3468daf1c37d15047ee66bca8760d
Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/linux into timers/core

* Remove the deprecated setup_sched_clock() API
* Minor NTP updates