Ingo Molnar f407a82586 Merge branch 'linus' into sched/core, to resolve conflict ...

Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2015-06-02 08:05:42 +02:00

..

alarmtimer.c

…

clockevents.c

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-05-09 14:57:49 -07:00

clocksource.c

clocksource: Improve comment explaining clocks_calc_max_nsecs()'s 50% safety margin

2015-04-03 08:18:35 +02:00

hrtimer.c

ktime: Fix ktime_divns to do signed division

2015-05-13 10:19:35 +02:00

itimer.c

…

jiffies.c

tick: Move clocksource related stuff to timekeeping.h

2015-04-01 14:22:58 +02:00

Kconfig

clockevents: Remove CONFIG_GENERIC_CLOCKEVENTS_BUILD

2015-04-01 14:22:57 +02:00

Makefile

clockevents: Remove CONFIG_GENERIC_CLOCKEVENTS_BUILD

2015-04-01 14:22:57 +02:00

ntp_internal.h

…

ntp.c

time: Add y2038 safe update_persistent_clock64()

2015-04-03 08:18:20 +02:00

posix-clock.c

…

posix-cpu-timers.c

sched, timer: Use the atomic task_cputime in thread_group_cputimer

2015-05-08 12:17:46 +02:00

posix-timers.c

…

sched_clock.c

timers, sched/clock: Clean up the code a bit

2015-03-27 08:34:01 +01:00

test_udelay.c

…

tick-broadcast-hrtimer.c

timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop

2015-03-23 10:50:05 +01:00

tick-broadcast.c

clockevents: Cleanup dead cpu explicitely

2015-04-03 08:44:37 +02:00

tick-common.c

timers/PM: Drop unnecessary braces from tick_freeze()

2015-04-03 15:15:52 +02:00

tick-internal.h

clockevents: Cleanup dead cpu explicitely

2015-04-03 08:44:37 +02:00

tick-oneshot.c

clockevents: Manage device's state separately for the core

2015-03-27 10:26:19 +01:00

tick-sched.c

tick: Move core only declarations and functions to core

2015-04-01 14:22:58 +02:00

tick-sched.h

arm/bL_switcher: Kill tick suspend hackery

2015-04-01 14:23:00 +02:00

time.c

…

timeconst.bc

…

timeconv.c

…

timecounter.c

…

timekeeping_debug.c

…

timekeeping_internal.h

…

timekeeping.c

timekeeping: Get rid of stale comment

2015-04-03 08:44:37 +02:00

timekeeping.h

tick: Move clocksource related stuff to timekeeping.h

2015-04-01 14:22:58 +02:00

timer_list.c

tick: Move core only declarations and functions to core

2015-04-01 14:22:58 +02:00

timer_stats.c

…

timer.c

timer: Further simplify the SMP and HOTPLUG logic

2015-04-02 17:46:21 +02:00