David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
alarmtimer.c	alarmtimer: Lock k_itimer during timer callback	2014-09-12 13:59:12 -07:00
clockevents.c	clockevents: Prevent shift out of bounds	2014-10-25 10:43:15 +02:00
clocksource.c	time: move the timecounter/cyclecounter code into its own file.	2014-12-30 18:29:25 -05:00
hrtimer.c	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
itimer.c
jiffies.c
Kconfig	clocksource: Move cycle_last validation to core code	2014-07-23 15:01:51 -07:00
Makefile	time: move the timecounter/cyclecounter code into its own file.	2014-12-30 18:29:25 -05:00
ntp_internal.h
ntp.c	time: adjtimex: Validate the ADJ_FREQUENCY values	2015-01-07 09:50:32 -08:00
posix-clock.c
posix-cpu-timers.c	sched/cputime: Fix cpu_timer_sample_group() double accounting	2014-11-16 10:04:18 +01:00
posix-timers.c	posix-timers: Fix stack info leak in timer_create()	2014-10-25 10:43:15 +02:00
sched_clock.c	sched_clock: Avoid corrupting hrtimer tree during suspend	2014-07-24 12:02:49 +02:00
test_udelay.c	time: Rename udelay_test.c to test_udelay.c	2014-11-21 11:59:55 -08:00
tick-broadcast-hrtimer.c
tick-broadcast.c	time: Replace __get_cpu_var uses	2014-08-26 13:45:44 -04:00
tick-common.c	Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2014-10-15 07:48:18 +02:00
tick-internal.h	nohz: Move nohz full init call to tick init	2014-09-13 18:34:44 +02:00
tick-oneshot.c	time: Replace __get_cpu_var uses	2014-08-26 13:45:44 -04:00
tick-sched.c	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-19 13:29:20 -08:00
time.c	Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-01-25 17:47:34 -08:00
timeconst.bc
timeconv.c
timecounter.c	timecounter: keep track of accumulated fractional nanoseconds	2014-12-30 18:29:27 -05:00
timekeeping_debug.c
timekeeping_internal.h	clocksource: Move cycle_last validation to core code	2014-07-23 15:01:51 -07:00
timekeeping.c	Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-10 10:13:28 -08:00
timekeeping.h	time: Consolidate the time accessor prototypes	2014-07-23 10:17:54 -07:00
timer_list.c
timer_stats.c
timer.c	rcu: Remove "cpu" argument to rcu_check_callbacks()	2014-11-03 19:20:11 -08:00