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
..
bios_uv.c	x86: Move uv to platform	2010-10-27 14:30:02 +02:00
Makefile	x86: Move uv to platform	2010-10-27 14:30:02 +02:00
tlb_uv.c	x86: Stop including <linux/delay.h> in two asm header files	2011-03-29 09:37:42 +02:00
uv_irq.c	x86: Cleanup the genirq name space	2011-03-12 14:12:00 +01:00
uv_sysfs.c	x86: Move uv to platform	2010-10-27 14:30:02 +02:00
uv_time.c	x86: Convert remaining x86 clocksources to clocksource_register_hz/khz	2011-02-21 13:33:33 -08:00