Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core

This commit is contained in:
Thomas Gleixner
2013-04-03 12:27:29 +02:00
130 changed files with 1679 additions and 971 deletions

View File

@@ -4,6 +4,8 @@
#include <linux/hrtimer.h>
#include <linux/tick.h>
extern seqlock_t jiffies_lock;
#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
#define TICK_DO_TIMER_NONE -1