You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		14 years ago
..
Kconfig	clocksource: add common i8253 PIT clocksource	14 years ago
Makefile	clocksource: add common i8253 PIT clocksource	14 years ago
acpi_pm.c	acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails	14 years ago
cs5535-clockevt.c	Andres has moved	15 years ago
cyclone.c	x86: Convert remaining x86 clocksources to clocksource_register_hz/khz	14 years ago
i8253.c	clocksource: add common i8253 PIT clocksource	14 years ago
scx200_hrt.c	clocksource: pass clocksource to read() callback	16 years ago
sh_cmt.c	clocksource: sh_cmt: Remove nested spinlock fix	14 years ago
sh_mtu2.c	ARM: shmobile: remove sh_timer_config clk member	14 years ago
sh_tmu.c	ARM: shmobile: remove sh_timer_config clk member	14 years ago
tcb_clksrc.c	drivers/clocksource/tcb_clksrc.c: fix init sequence	14 years ago