David S. Miller b48b63a1f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/netfilter/nfnetlink_log.c net/netfilter/xt_LOG.c Rather easy conflict resolution, the 'net' tree had bug fixes to make sure we checked if a socket is a time-wait one or not and elide the logging code if so. Whereas on the 'net-next' side we are calculating the UID and GID from the creds using different interfaces due to the user namespace changes from Eric Biederman. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-15 11:43:53 -04:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
b44.c	b44: add 64 bit stats	2012-07-18 09:29:43 -07:00
b44.h	b44: add 64 bit stats	2012-07-18 09:29:43 -07:00
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: Try to recover from PCI block reset	2012-07-16 23:12:02 -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: Allocate UIO resources only on devices that support iSCSI.	2012-09-10 15:48:21 -04:00
cnic.c	cnic: Allocate UIO resources only on devices that support iSCSI.	2012-09-10 15:48:21 -04:00
cnic.h	cnic: Allocate kcq resource only on devices that support FCoE.	2012-09-10 15:48:21 -04:00
Kconfig	MII: fix Kconfig dependencies for MII	2011-09-15 15:49:08 -04:00
Makefile
sb1250-mac.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tg3.c	tg3: Update version to 3.124	2012-07-29 23:18:31 -07:00
tg3.h	tg3: Add New 5719 Read DMA workaround	2012-07-29 23:18:31 -07:00