Ingo Molnar 249d51b53a Merge commit 'v2.6.29-rc4' into core/percpu ... Conflicts: arch/x86/mach-voyager/voyager_smp.c arch/x86/mm/fault.c		2009-02-09 14:58:11 +01:00
..
Makefile	sgi-xp: only build for ia64-sn2 when CONFIG_IA64_GENERIC specified	2008-10-30 11:38:46 -07:00
xp_main.c	SGI: struct device - replace bus_id with dev_name(), dev_set_name()	2009-01-06 10:44:37 -08:00
xp_nofault.S
xp_sn2.c	sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()	2008-11-05 20:32:20 -08:00
xp_uv.c	sgi-xp: define xp_partition_id and xp_region_size	2008-11-05 20:32:21 -08:00
xp.h	x86: uv cleanup, build fix #2	2009-01-21 11:59:11 +01:00
xpc_channel.c	sgi-xpc: fix up stale DBUG_ON statements	2009-01-29 18:04:43 -08:00
xpc_main.c	cpumask: convert misc driver functions	2009-01-11 19:12:52 +01:00
xpc_partition.c	sgi-xp: setup the activate GRU message queue	2008-07-30 09:41:50 -07:00
xpc_sn2.c	sgi-xpc: fix up stale DBUG_ON statements	2009-01-29 18:04:43 -08:00
xpc_uv.c	sgi-xp: fix writing past the end of kzalloc()'d space	2009-02-05 12:56:49 -08:00
xpc.h	sgi-xp: fix writing past the end of kzalloc()'d space	2009-02-05 12:56:49 -08:00
xpnet.c	sgi-xp: link XPNET's net_device_ops to its net_device structure	2009-02-03 15:16:48 -08:00