Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
sn2	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
bte_error.c	[IA64] Fix Altix BTE error return status	2007-12-19 11:19:19 -08:00
bte.c	[IA64] bte_copy of BTE_MAX_XFER trips BUG_ON.	2009-02-19 11:29:31 -08:00
huberror.c	[IA64] minor irq handler cleanups	2008-04-22 08:56:58 -07:00
idle.c
io_acpi_init.c	ACPICA: Add post-order callback to acpi_walk_namespace	2009-11-24 21:31:10 -05:00
io_common.c	[IA64] use printk_once() unaligned.c/io_common.c	2009-10-13 12:48:25 -07:00
io_init.c	[IA64] BUG to BUG_ON changes	2009-04-01 09:50:48 -07:00
iomv.c	[IA64] Move include/asm-ia64 to arch/ia64/include/asm	2008-08-01 10:21:21 -07:00
irq.c	[IA64] remove obsolete irq_desc_t typedef	2009-06-15 14:34:31 -07:00
klconflib.c	[IA64-SGI] sn2 housekeeping	2006-02-02 13:35:59 -08:00
machvec.c
Makefile	[IA64] move XP and XPC to drivers/misc/sgi-xp	2008-04-22 15:08:17 -07:00
mca.c	[IA64] remove remaining __FUNCTION__ occurrences	2008-03-06 09:19:27 -08:00
msi_sn.c	irq: change ->set_affinity() to return status	2009-04-28 12:21:16 +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	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
tiocx.c	[IA64] Convert ia64 to use int-ll64.h	2009-06-17 09:33:49 -07:00