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
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-25 15:50:32 -07:00
b44.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-26 21:55:51 -05:00
b44.h
bcm63xx_enet.c	bcm63xx-enet: fix PHY name to match MDIO bus name	2012-02-13 16:04:08 -05:00
bcm63xx_enet.h
bnx2_fw.h
bnx2.c	bnx2: Update version 2.2.2	2012-06-16 22:22:59 -07:00
bnx2.h	bnx2: Read PCI function number from internal register	2012-06-16 22:22:59 -07:00
cnic_defs.h	cnic: Fix parity error code conflict	2012-03-21 21:57:36 -04:00
cnic_if.h	cnic: Fix parity error code conflict	2012-03-21 21:57:36 -04:00
cnic.c	ethernet: Remove casts to same type	2012-06-06 09:31:33 -07:00
cnic.h
Kconfig
Makefile
sb1250-mac.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tg3.c	tg3: Apply short DMA frag workaround to 5906	2012-06-11 16:55:10 -07:00
tg3.h	tg3: use netdev_alloc_frag() API	2012-05-19 04:02:12 -04:00