David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07: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-xp/sgi-gru: allow modules to load on non-uv systems	2009-04-21 13:41:50 -07: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	SGI IA64 UV: fix ia64 build error in the linux-next tree	2009-02-11 13:31:47 +01:00
xpc_channel.c	sgi-xpc: clean up numerous globals	2009-04-13 15:04:33 -07:00
xpc_main.c	sgi-xpc: clean up numerous globals	2009-04-13 15:04:33 -07:00
xpc_partition.c	sgi-xpc: clean up numerous globals	2009-04-13 15:04:33 -07:00
xpc_sn2.c	sgi-xpc: clean up numerous globals	2009-04-13 15:04:33 -07:00
xpc_uv.c	page allocator: do not check NUMA node ID when the caller knows the node is valid	2009-06-16 19:47:32 -07:00
xpc.h	sgi-xpc: clean up numerous globals	2009-04-13 15:04:33 -07:00
xpnet.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-08-12 17:44:53 -07:00