linux/drivers/net/ethernet/intel
David S. Miller a210576cf8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-01 13:36:50 -04:00
..
e1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
e1000e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
igb igb: fix PHC stopping on max freq 2013-03-26 03:21:34 -07:00
igbvf drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0) 2013-03-17 12:50:24 -04:00
ixgb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-01 13:36:50 -04:00
ixgbe ixgbe: Don't give VFs random MAC addresses 2013-03-28 01:04:00 -07:00
ixgbevf ixgbevf: Adjust to handle unassigned MAC address from PF 2013-03-28 01:13:46 -07:00
e100.c remove init of dev->perm_addr in drivers 2013-01-08 18:00:48 -08:00
Kconfig Driver core patches for 3.9-rc1 2013-02-21 12:05:51 -08:00
Makefile