John Stultz 19c3205cea Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time ...

Merge in 64bit sched_clock support that missed 3.12.

Conflicts:
	kernel/time/sched_clock.c

Signed-off-by: John.Stultz <john.stultz@linaro.org>

2013-09-16 18:52:52 -07:00

..

alarmtimer.c

alarmtimer: Export symbols of functions declared in linux/alarmtimer.h

2013-06-12 14:02:12 -07:00

clockevents.c

clockevents: Implement unbind functionality

2013-05-16 11:09:18 +02:00

clocksource.c

clocksource: Extract max nsec calculation into separate function

2013-07-30 11:24:20 -07:00

jiffies.c

…

Kconfig

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

2013-09-04 09:36:54 -07:00

Makefile

sched_clock: Make ARM's sched_clock generic for all architectures

2013-06-12 14:02:13 -07:00

ntp_internal.h

…

ntp.c

ntp: Remove unused variable flags in __hardpps

2013-05-28 13:45:19 -07:00

posix-clock.c

…

sched_clock.c

sched_clock: Add support for >32 bit sched_clock

2013-07-30 11:24:21 -07:00

tick-broadcast.c

tick: broadcast: Check broadcast mode on CPU hotplug

2013-07-12 12:35:40 +02:00

tick-common.c

tick: Sanitize broadcast control logic

2013-07-02 14:26:45 +02:00

tick-internal.h

clockevents: Define CS_NAME_LEN unconditionally

2013-05-28 09:28:02 +02:00

tick-oneshot.c

…

tick-sched.c

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

2013-08-19 09:17:35 -07:00

timeconv.c

…

timekeeping_debug.c

power: Add option to log time spent in suspend

2013-05-29 12:57:34 -07:00

timekeeping_internal.h

power: Add option to log time spent in suspend

2013-05-29 12:57:34 -07:00

timekeeping.c

Merge branch 'timers/posix-cpu-timers-for-tglx' of

2013-07-04 23:11:22 +02:00

timer_list.c

timer_list: correct the iterator for timer_list

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

timer_stats.c

…