Russell King b0df898680 Merge branch 'devel-stable' into for-linus ... Conflicts: arch/arm/Kconfig.debug arch/arm/plat-versatile/Kconfig Merge fixes: arch/arm/mach-integrator/Kconfig drivers/clocksource/Kconfig		2012-03-27 11:30:31 +01:00
..
acpi_pm.c	time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver	2011-11-21 19:00:58 -08:00
clksrc-dbx500-prcmu.c	ARM: 7261/1: clocksource/ux500-prcmu: fix sched_clock breakage	2012-01-03 15:17:56 +00:00
cs5535-clockevt.c
cyclone.c
dw_apb_timer.c
i8253.c	time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver	2011-11-21 19:00:59 -08:00
Kconfig	Merge branch 'devel-stable' into for-linus	2012-03-27 11:30:31 +01:00
Makefile
mmio.c
scx200_hrt.c
sh_cmt.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
sh_mtu2.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
sh_tmu.c	drivers/clocksource: Add module.h to those who were using it implicitly	2011-10-31 19:31:42 -04:00
tcb_clksrc.c	clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz	2011-11-21 19:01:42 -08:00