From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 24 May 2014 00:05:51 +0000 (+0200)
Subject: Merge branch 'fortglx/3.16/time' of git://git.linaro.org/people/john.stultz/linux... 
X-Git-Tag: v3.16-rc1~47^2~18^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=309179fabddd074f7da63c5602bc32cb6de677f9;p=users%2Fjedix%2Flinux-maple.git

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
---

309179fabddd074f7da63c5602bc32cb6de677f9