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
..
Kconfig	drivers/net/ethernet/*: Enabled vendor Kconfig options	2011-08-27 00:58:56 -07:00
Makefile	…
mv643xx_eth.c	net: remove skb recycling	2012-10-07 00:40:54 -04:00
pxa168_eth.c	ethernet: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-10-31 14:02:45 -04:00
skge.c	drivers/net: use tasklet_kill in device remove/close process	2012-11-03 15:10:15 -04:00
skge.h	…
sky2.c	drivers/net/ethernet/marvell/sky2.c: fix error return code	2012-10-07 14:37:12 -04:00
sky2.h	sky2: Added support for Optima EEE	2012-07-09 00:05:40 -07:00