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
..
cpmac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
davinci_cpdma.c	davinci-cpdma: fix locking issue in cpdma_chan_stop	2011-12-19 16:31:13 -05:00
davinci_cpdma.h
davinci_emac.c	davinci_emac: use eth_hw_addr_random() instead of random_ether_addr()	2012-02-17 15:52:31 -05:00
davinci_mdio.c	drivers/net/ethernet/ti: Move call to PTR_ERR after reassignment	2012-02-02 14:35:12 -05:00
Kconfig	drivers/net/ethernet/*: Enabled vendor Kconfig options	2011-08-27 00:58:56 -07:00
Makefile
tlan.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tlan.h