David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
Makefile
upt1_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	2010-10-24 15:52:31 -07:00
vmxnet3_defs.h	vmxnet3: remove set_flag_le{16,64} helpers	2010-10-24 15:52:31 -07:00
vmxnet3_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
vmxnet3_ethtool.c	vmxnet3" make ethtool ops const	2012-01-05 13:23:00 -05:00
vmxnet3_int.h	vmxnet3: Fix transport header size	2012-03-01 22:09:41 -05:00