Thomas Gleixner a18f22a968 Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource ...

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2011-05-14 12:06:36 +02:00

..

acpi_pm.c

acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails

2011-01-21 17:38:19 +01:00

cs5535-clockevt.c

Andres has moved

2010-07-20 16:25:41 -07:00

cyclone.c

x86: Convert remaining x86 clocksources to clocksource_register_hz/khz

2011-02-21 13:33:33 -08:00

i8253.c

clocksource: add common i8253 PIT clocksource

2011-05-14 10:29:47 +01:00

Kconfig

clocksource: add common i8253 PIT clocksource

2011-05-14 10:29:47 +01:00

Makefile

clocksource: add common i8253 PIT clocksource

2011-05-14 10:29:47 +01:00

scx200_hrt.c

…

sh_cmt.c

clocksource: sh_cmt: Remove nested spinlock fix

2010-12-17 19:38:33 +09:00

sh_mtu2.c

ARM: shmobile: remove sh_timer_config clk member

2010-10-31 10:40:39 -04:00

sh_tmu.c

ARM: shmobile: remove sh_timer_config clk member

2010-10-31 10:40:39 -04:00

tcb_clksrc.c

drivers/clocksource/tcb_clksrc.c: fix init sequence

2011-01-26 10:50:04 +10:00