David S. Miller 32efe08d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c Small minor conflict in bnx2x, wherein one commit changed how statistics were stored in software, and another commit fixed endianness bugs wrt. reading the values provided by the chip in memory. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-02-19 16:03:15 -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	net: use eth_hw_addr_random() and reset addr_assign_type	2012-02-15 15:34:17 -05:00
ks8851_mll.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
ks8851.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
ks8851.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
ksz884x.c	netdev: ethernet dev_alloc_skb to netdev_alloc_skb	2012-02-06 11:52:27 -05:00
Makefile