David S. Miller 638d3c6381 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-07-13 17:28:09 -07:00

..

cpmac.c

ethernet: ti: remove unwanted THIS_MODULE macro

2014-09-09 11:59:14 -07:00

cpsw_ale.c

net: cpsw: remove two unused global functions

2015-05-25 18:19:09 -04:00

cpsw_ale.h

net: cpsw: remove two unused global functions

2015-05-25 18:19:09 -04:00

cpsw-common.c

net: ethernet: ti/cpsw-common.c: fix sparse warning

2015-02-05 00:27:49 -08:00

cpsw-phy-sel.c

ethernet: ti: remove unwanted THIS_MODULE macro

2014-09-09 11:59:14 -07:00

cpsw.c

drivers: net: cpsw: fix disabling of tx interrupt in rx isr

2015-07-09 14:52:48 -07:00

cpsw.h

net: cpsw: Add a minimal cpsw-common module for shared code

2015-01-30 17:42:01 -08:00

cpts.c

ptp: cpts: use helpers for converting ns to timespec.

2015-03-31 17:19:19 -04:00

cpts.h

time: move the timecounter/cyclecounter code into its own file.

2014-12-30 18:29:25 -05:00

davinci_cpdma.c

drivers: net: davinci_cpdma: remove spinlock as SOFTIRQ-unsafe lock order detected

2014-10-14 15:59:38 -04:00

davinci_cpdma.h

net/davinci_cpdma: remove unused argument in cpdma_chan_submit()

2013-04-25 04:11:50 -04:00

davinci_emac.c

net: davinci_emac: Get device MAC on 3517

2015-01-30 17:42:01 -08:00

davinci_mdio.c

net: davinci_mdio: add hibernation callbacks

2015-03-01 13:40:22 -05:00

Kconfig

drivers/net: remove all references to obsolete Ethernet-HOWTO

2015-06-23 06:50:35 -07:00

Makefile

drivers: net: cpsw: make cpsw_ale.c a module to allow re-use on Keystone

2015-01-31 17:33:07 -08:00

netcp_core.c

net: Drop owner assignment from platform_driver

2015-07-10 23:18:29 -07:00

netcp_ethss.c

net: netcp: remove call to netif_carrier_(on/off) for MAC to Phy interface

2015-04-27 23:11:49 -04:00

netcp_sgmii.c

net: netcp: Add Keystone NetCP GbE driver

2015-01-19 15:07:39 -05:00

netcp_xgbepcsr.c

net: netcp: Enhance GBE driver to support 10G Ethernet

2015-01-19 15:07:39 -05:00

netcp.h

net: netcp: fix forward port number usage for 10G ethss

2015-03-20 22:03:09 -04:00

tlan.c

tlan: msecs_to_jiffies convrsion

2015-02-04 13:58:29 -08:00

tlan.h

tlan: Don't scream if no link

2014-07-07 17:06:52 -07:00