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
..
e1000	e1000: fix concurrent accesses to PHY from watchdog and ethtool	2012-11-01 03:11:13 -07:00
e1000e	e1000e: Minimum packet size must be 17 bytes	2012-10-23 01:02:19 -07:00
igb	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next	2012-11-02 18:45:35 -04:00
igbvf	igbvf: Check for error on dma_map_single call	2012-10-29 23:48:58 -07:00
ixgb	netdev: make pci_error_handlers const	2012-09-07 16:35:00 -06:00
ixgbe	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
ixgbevf	eth: Make is_link_local() consistent with other address tests	2012-11-02 21:34:05 -04:00
e100.c	netdev: make pci_error_handlers const	2012-09-07 16:35:00 -06:00
Kconfig	ptp: Enable clock drivers along with associated net/PHY drivers	2012-11-01 11:35:18 -04:00
Makefile