linux/drivers/net/ethernet/intel
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
e1000 e1000: Combining Bitwise OR in one expression. 2012-06-20 01:08:44 -07:00
e1000e e1000e: use more informative logging macros when netdev not yet registered 2012-06-14 03:03:14 -07:00
igb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
igbvf igbvf: fix the bug when initializing the igbvf 2012-04-30 18:54:31 -07:00
ixgb intel: make wired ethernet driver message level consistent (rev2) 2012-03-27 23:29:22 -07:00
ixgbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
ixgbevf ixgbevf: Update version string 2012-05-03 02:38:38 -07:00
e100.c e100: enable transmit time stamping. 2012-04-14 02:02:41 -07:00
Kconfig Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support. 2012-06-20 00:52:54 -07:00
Makefile