OpenCloudOS-Kernel/drivers/net/ethernet/intel
David S. Miller e5f2ef7ab4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-03-12 05:52:22 -04:00
..
e1000 e1000: fix whitespace issues and multi-line comments 2013-02-15 21:46:37 -08:00
e1000e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-03-12 05:52:22 -04:00
igb igb: Fix for lockdep issue in igb_get_i2c_client 2013-03-05 01:25:27 -08:00
igbvf igbvf: Make next_to_watch a pointer and adjust memory barriers to avoid races 2013-02-15 21:46:51 -08:00
ixgb drivers: net: Remove remaining alloc/OOM messages 2013-02-08 17:44:39 -05:00
ixgbe ixgbe: Make use of the default fdb handlers. 2013-03-07 15:29:45 -05:00
ixgbevf ixgbevf: use PCI_DEVICE_TABLE macro 2013-03-08 00:10:26 -08:00
Kconfig Driver core patches for 3.9-rc1 2013-02-21 12:05:51 -08:00
Makefile
e100.c remove init of dev->perm_addr in drivers 2013-01-08 18:00:48 -08:00