John Stultz 17deb9c2db Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion ...

Update to tip/timers/core and resolve minor conflict.

Conflicts:
	drivers/clocksource/samsung_pwm_timer.c

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

2013-09-26 12:05:54 -07:00

..

acpi_pm.c

treewide: Fix printks with 0x%#

2013-08-27 10:49:38 +02:00

arm_arch_timer.c

Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core

2013-08-21 14:59:23 +02:00

arm_global_timer.c

clocksource+irqchip: delete __cpuinit usage from all related files

2013-07-14 19:36:57 -04:00

bcm2835_timer.c

clocksource: bcm2835: Switch to sched_clock_register()

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

bcm_kona_timer.c

ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)

2013-08-20 10:51:38 -07:00

cadence_ttc_timer.c

clocksource: cadence_ttc: Reuse clocksource as sched_clock

2013-07-18 15:27:34 +02:00

clksrc-dbx500-prcmu.c

clocksource: dbx500-prcmu: Switch to sched_clock_register()

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

clksrc-of.c

clocksource: make CLOCKSOURCE_OF_DECLARE type safe

2013-03-28 12:01:06 +01:00

cs5535-clockevt.c

clocksource: use clockevents_config_and_register() where possible

2013-01-14 10:12:42 -08:00

cyclone.c

…

dummy_timer.c

clocksource+irqchip: delete __cpuinit usage from all related files

2013-07-14 19:36:57 -04:00

dw_apb_timer_of.c

clocksource: dw_apb_timer_of: Switch to sched_clock_register()

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

dw_apb_timer.c

Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"

2013-06-18 16:02:04 -07:00

em_sti.c

clocksource: em_sti: Convert to devm_* managed helpers

2013-08-22 00:18:42 +02:00

exynos_mct.c

Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

2013-07-23 16:54:15 -07:00

i8253.c

time: Kill xtime_lock, replacing it with jiffies_lock

2012-11-13 14:08:23 -05:00

Kconfig

clocksource: samsung_pwm_timer: Do not use clocksource_mmio

2013-08-06 01:21:43 +02:00

Makefile

ARM: clocksource: Add support for MOXA ART SoCs

2013-07-18 15:27:47 +02:00

metag_generic.c

clocksource+irqchip: delete __cpuinit usage from all related files

2013-07-14 19:36:57 -04:00

mmio.c

…

moxart_timer.c

ARM: clocksource: moxart: Add bitops.h include

2013-08-01 01:13:34 +02:00

mxs_timer.c

clocksource: mxs_timer: Switch to sched_clock_register()

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

nomadik-mtu.c

Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion

2013-09-26 12:05:54 -07:00

samsung_pwm_timer.c

Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion

2013-09-26 12:05:54 -07:00

scx200_hrt.c

…

sh_cmt.c

clocksource: sh_cmt: 32-bit control register support

2013-08-22 00:18:45 +02:00

sh_mtu2.c

clocksource: sh_mtu2: Set initcall level to subsys

2013-03-13 02:24:37 +09:00

sh_tmu.c

clocksource: sh_tmu: Set initcall level to subsys

2013-03-13 02:24:36 +09:00

sun4i_timer.c

clocksource: sun4i: Fix bug when switching from periodic to oneshot modes

2013-07-18 15:27:21 +02:00

tcb_clksrc.c

clocksource: use clockevents_config_and_register() where possible

2013-01-14 10:12:42 -08:00

tegra20_timer.c

clocksource: tegra: Switch to sched_clock_register()

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

time-armada-370-xp.c

Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion

2013-09-26 12:05:54 -07:00

time-orion.c

clocksource: orion: Use linux/sched_clock.h

2013-07-17 20:28:00 -07:00

timer-marco.c

Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

2013-07-23 16:54:15 -07:00

timer-prima2.c

clocksource: sirf: Switch to sched_clock_register() and use 64 bits

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

vf_pit_timer.c

clocksource: vf_pit_timer: Switch to sched_clock_register()

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

vt8500_timer.c

clocksource: make CLOCKSOURCE_OF_DECLARE type safe

2013-03-28 12:01:06 +01:00

zevio-timer.c

clocksource: Add TI-Nspire timer support

2013-06-06 17:23:13 +02:00