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: misc: Remove MISC_DEVICES config option	2012-01-24 16:24:02 -08:00
ks8695net.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-06 11:52:27 -05:00
ks8695net.h
ks8842.c	drivers/net: add missing __devexit_p() annotations	2012-04-21 15:28:47 -04:00
ks8851_mll.c	ethernet: Use eth_random_addr	2012-07-16 22:38:27 -07:00
ks8851.c	ethernet: Use eth_random_addr	2012-07-16 22:38:27 -07:00
ks8851.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
ksz884x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
Makefile