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

…

xp_main.c

…

xp_nofault.S

…

xp_sn2.c

…

xp_uv.c

…

xp.h

…

xpc_channel.c

…

xpc_main.c

…

xpc_partition.c

…

xpc_sn2.c

…

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

…

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