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
..
sn2	Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource	2011-05-14 12:06:36 +02:00
bte_error.c	[IA64] Fix Altix BTE error return status	2007-12-19 11:19:19 -08:00
bte.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
huberror.c	[IA64] minor irq handler cleanups	2008-04-22 08:56:58 -07:00
idle.c
io_acpi_init.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
io_common.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
io_init.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
iomv.c	[IA64] Move include/asm-ia64 to arch/ia64/include/asm	2008-08-01 10:21:21 -07:00
irq.c	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
klconflib.c	[IA64-SGI] sn2 housekeeping	2006-02-02 13:35:59 -08:00
machvec.c
Makefile	ia64: change to new flag variables	2011-03-17 14:02:56 +01:00
mca.c	[IA64] remove remaining __FUNCTION__ occurrences	2008-03-06 09:19:27 -08:00
msi_sn.c	ia64: Convert to the new irq_* function names	2011-03-29 14:48:05 +02:00
pio_phys.S	[IA64-SGI] - Eliminate SN pio_phys_xxx macros. Move to assembly	2006-02-07 09:24:14 -08:00
setup.c	[IA64] setup.c Typo fix "Architechtuallly"	2011-03-02 14:00:11 -08:00
tiocx.c	[IA64] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00