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

…

clockevents.c

…

clocksource.c

time: move the timecounter/cyclecounter code into its own file.

2014-12-30 18:29:25 -05:00

hrtimer.c

…

itimer.c

…

jiffies.c

…

Kconfig

…

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

…

posix-timers.c

…

sched_clock.c

…

test_udelay.c

…

tick-broadcast-hrtimer.c

…

tick-broadcast.c

…

tick-common.c

…

tick-internal.h

…

tick-oneshot.c

…

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

…

timekeeping.c

…

timekeeping.h

…

timer_list.c

…

timer_stats.c

…

timer.c

…