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
..
cpmac.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
cpsw_ale.c	netdev: driver: ethernet: add cpsw address lookup engine support	2012-03-19 18:02:05 -04:00
cpsw_ale.h	netdev: driver: ethernet: add cpsw address lookup engine support	2012-03-19 18:02:05 -04:00
cpsw.c	drivers: net: ethernet: cpsw: Add device tree support to CPSW	2012-08-03 20:40:12 -07:00
davinci_cpdma.c	drivers/net/ethernet/ti/davinci_cpdma.c: Remove potential NULL dereference	2012-08-14 16:59:43 -07:00
davinci_cpdma.h	davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers	2011-08-12 03:41:10 -07:00
davinci_emac.c	net: ethernet: davinci_emac: add pm_runtime support	2012-07-22 12:46:42 -07:00
davinci_mdio.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-15 11:43:53 -04:00
Kconfig	drivers: net: ethernet: cpsw: Add SOC dependency support for cpsw dependent modules	2012-08-03 20:40:12 -07:00
Makefile	netdev: driver: ethernet: Add TI CPSW driver	2012-03-19 18:02:05 -04:00
tlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
tlan.h	davinci*/tlan/cpmac: Move the Texas Instruments (TI) drivers	2011-08-12 03:41:10 -07:00