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
..
cache.c	[PATCH] change gen_pool allocator to not touch managed memory	2006-06-23 07:42:49 -07:00
io.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
prominfo_proc.c	proc 2/2: remove struct proc_dir_entry::owner	2009-03-31 01:14:44 +04:00
ptc_deadlock.S	[IA64-SGI] Fix SN PTC deadlock recovery	2005-12-06 09:13:42 -08:00
sn2_smp.c	percpu: make percpu symbols in ia64 unique	2009-10-29 22:34:14 +09:00
sn_hwperf.c	llseek: automatically add .llseek fop	2010-10-15 15:53:27 +02:00
sn_proc_fs.c	[IA64] Fix build breakage - sn_force_interrupt_flag: undefined	2011-03-29 17:22:23 -07:00
timer_interrupt.c	[IA64] Fix breakage from irq change	2006-10-06 10:09:41 -07:00
timer.c	ia64: convert to clocksource_register_hz/khz	2011-02-21 13:33:45 -08:00