David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -08:00
..
amso1100	infiniband: Kill directly reference of netdev->priv	2008-11-24 15:34:00 -08:00
cxgb3	RDMA/cxgb3: Fix deadlock in iw_cxgb3 (hang when configuring interface)	2008-11-12 10:16:47 -08:00
ehca	IB/ehca: Fix problem with generated flush work completions	2008-12-01 10:05:50 -08:00
ipath	IB/ipath: Fix RDMA write with immediate copy of last packet	2008-10-27 15:31:25 -07:00
mlx4	IB/mlx4: Fix MTT leakage in resize CQ	2008-12-01 10:09:37 -08:00
mthca	net: replace %p6 with %pI6	2008-10-29 12:52:50 -07:00
nes	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-18 23:38:23 -08:00