David S. Miller 17f7f4d9fc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/ipv4/fib_frontend.c		2010-12-26 22:37:05 -08:00
..
amso1100	Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iboe', 'ipoib', 'misc', 'mlx4', 'nes', 'qib' and 'srp' into for-next	2010-10-26 16:09:11 -07:00
cxgb3	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
cxgb4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
ehca	IB/ehca: Fix driver on relocatable kernel	2010-10-06 12:57:07 -07:00
ipath	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
mlx4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
mthca	IB/core: Add VLAN support for IBoE	2010-10-25 10:20:39 -07:00
nes	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2010-10-26 17:54:22 -07:00
qib	convert get_sb_single() users	2010-10-29 04:16:28 -04:00