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

time/timers: Move all time(r) related files into kernel/time

2014-06-23 11:22:35 +02:00

jiffies.c

time: Fix overflow when HZ is smaller than 60

2014-02-06 16:01:40 +01:00

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

timekeeping: Convert timekeeping core to use timespec64s

2014-07-23 10:17:54 -07:00

ntp.c

time: adjtimex: Validate the ADJ_FREQUENCY values

2015-01-07 09:50:32 -08:00

posix-clock.c

kernel: Fix files explicitly needing EXPORT_SYMBOL infrastructure

2011-10-31 19:30:05 -04:00

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: Fixup more fallout from hrtimer broadcast mode

2014-02-09 15:11:47 +01:00

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

time/timers: Move all time(r) related files into kernel/time

2014-06-23 11:22:35 +02:00

timeconv.c

time: add function to convert between calendar time and broken-down time for universal use

2009-09-24 07:20:56 -07:00

timecounter.c

timecounter: keep track of accumulated fractional nanoseconds

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

timekeeping_debug.c

timekeeping: Convert timekeeping core to use timespec64s

2014-07-23 10:17:54 -07:00

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_list: correct the iterator for timer_list

2013-08-28 19:26:38 -07:00

timer_stats.c

timer stats: Add a 'Collection: active/inactive' line to timer usage statistics

2013-10-10 09:59:25 +02:00

timer.c

rcu: Remove "cpu" argument to rcu_check_callbacks()

2014-11-03 19:20:11 -08:00