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
..
cxgb	Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers	2011-11-22 16:43:32 -05:00
cxgb3	ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-10-31 14:02:45 -04:00
cxgb4	cxgb4: Fix initialization of SGE_CONTROL register	2012-11-07 19:02:19 -05:00
cxgb4vf	cxgb4/cxgb4vf: Code cleanup to enable T4 Configuration File support	2012-09-27 17:55:50 -04:00
Kconfig
Makefile