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

..

acpi_pm.c

…

arm_arch_timer.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-01-06 22:29:20 -05:00

arm_global_timer.c

ARM: make it easier to check the CPU part number correctly

2014-07-18 12:29:02 +01:00

bcm2835_timer.c

…

bcm_kona_timer.c

clocksource: kona: fix __iomem annotation

2015-01-05 14:43:36 +01:00

cadence_ttc_timer.c

clocksource: cadence_ttc: Add support for 32bit mode

2014-09-29 01:59:09 +02:00

clksrc-dbx500-prcmu.c

…

clksrc-of.c

…

clps711x-timer.c

clocksource: clps711x: Add CLPS711X clocksource driver

2014-07-23 12:02:35 +02:00

cs5535-clockevt.c

…

dummy_timer.c

time: Replace __get_cpu_var uses

2014-08-26 13:45:44 -04:00

dw_apb_timer_of.c

…

dw_apb_timer.c

…

em_sti.c

…

exynos_mct.c

clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write

2015-01-05 14:43:35 +01:00

fsl_ftm_timer.c

…

i8253.c

…

Kconfig

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2014-12-11 17:56:37 -08:00

Makefile

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2014-12-11 17:56:37 -08:00

meson6_timer.c

ARM: meson6: clocksource: Add Meson6 timer support

2014-09-29 01:50:05 +02:00

metag_generic.c

drivers/clocksource: Replace __get_cpu_var used for address calculation

2014-08-26 13:45:46 -04:00

mips-gic-timer.c

clocksource: mips-gic: Add device-tree support

2014-11-24 07:45:30 +01:00

mmio.c

…

moxart_timer.c

…

mtk_timer.c

clocksource: Add support for the Mediatek SoCs

2014-07-23 12:02:31 +02:00

mxs_timer.c

…

nomadik-mtu.c

…

pxa_timer.c

clocksource: pxa: Add device-tree support for PXA timer

2014-07-23 12:02:37 +02:00

qcom-timer.c

clocksource: Replace __this_cpu_ptr with raw_cpu_ptr

2014-08-26 13:45:56 -04:00

samsung_pwm_timer.c

…

scx200_hrt.c

…

sh_cmt.c

clocksource: sh_cmt: Add DT support

2014-07-04 15:46:17 +02:00

sh_mtu2.c

clocksource: sh_mtu2: Add DT support

2014-07-04 15:50:29 +02:00

sh_tmu.c

clocksource: sh_tmu: Set cpu_possible_mask to fix SMP broadcast

2015-01-05 14:43:37 +01:00

sun4i_timer.c

clockevent: sun4i: Fix race condition in the probe code

2014-11-19 10:43:51 +01:00

tcb_clksrc.c

clocksource: tcb_clksrc: Sanitize IRQ request

2014-09-29 01:50:05 +02:00

tegra20_timer.c

clocksource: tegra: Use us counter as delay timer

2014-06-16 12:48:12 -06:00

time-armada-370-xp.c

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

2014-12-10 08:18:32 -08:00

time-efm32.c

…

time-orion.c

…

timer-atmel-pit.c

ARM: at91/clocksource: remove !DT PIT initializations

2014-12-03 14:15:52 +01:00

timer-integrator-ap.c

ARM: integrator: move AP timer to clocksource

2014-10-28 15:42:34 +01:00

timer-keystone.c

…

timer-marco.c

clocksource: sirf: Remove hard-coded clock rate

2014-11-19 11:19:20 +01:00

timer-prima2.c

clocksource: sirf: Fix incorrect clock enable counter for timer

2014-07-23 12:02:34 +02:00

timer-sun5i.c

…

timer-u300.c

…

versatile.c

…

vf_pit_timer.c

clocksource: vf_pit_timer: Support shutdown mode

2014-09-29 01:50:05 +02:00

vt8500_timer.c

…

zevio-timer.c

…