Skip to content
Commit 309179fa authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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
parents 2779ac16 ea54bca3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment