Ingo Molnar 82638844d9 Merge branch 'linus' into cpus4096 ... Conflicts: arch/x86/xen/smp.c kernel/sched_rt.c net/iucv/iucv.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2008-07-16 00:29:07 +02:00
..
core	RDMA/cma: Simplify locking needed for serialization of callbacks	2008-07-14 23:48:53 -07:00
hw	Merge branch 'linus' into cpus4096	2008-07-16 00:29:07 +02:00
ulp	IPoIB: Double default RX/TX ring sizes	2008-07-14 23:48:52 -07:00
Kconfig	RDMA/nes: Add a driver for NetEffect RNICs	2008-02-04 20:20:45 -08:00
Makefile	RDMA/nes: Add a driver for NetEffect RNICs	2008-02-04 20:20:45 -08:00