David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

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

2013-12-18 16:42:06 -05:00

..

cpmac.c

net: cpmac: use dev_get_platdata()

2013-08-30 17:43:38 -04:00

cpsw_ale.c

drivers: net: cpsw: Add helper functions for VLAN ALE implementation

2013-02-06 15:46:40 -05:00

cpsw_ale.h

drivers: net:ethernet: cpsw: add support for VLAN

2013-02-06 15:46:40 -05:00

cpsw-phy-sel.c

net: ethernet: cpsw-phy-sel: Remove redundant of_match_ptr

2013-10-01 12:30:25 -04:00

cpsw.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-12-18 16:42:06 -05:00

cpsw.h

drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw

2013-09-24 10:33:07 -04:00

cpts.c

treewide: Fix typos in printk

2013-03-20 16:26:32 +01:00

cpts.h

ti: Remove extern from function prototypes

2013-09-24 12:54:10 -07:00

davinci_cpdma.c

net: eth: davinci_cpdma: Mark a local variable static

2013-12-11 19:53:55 -05: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: Fix platform data handling and make usable for am3517

2013-12-05 20:39:36 -05:00

davinci_mdio.c

net: davinci_mdio: use dev_get_platdata()

2013-08-30 17:43:38 -04:00

Kconfig

drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw

2013-09-24 10:33:07 -04:00

Makefile

drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw

2013-09-24 10:33:07 -04:00

tlan.c

net: tlan: remove unnecessary pci_set_drvdata()

2013-10-23 16:58:41 -04:00

tlan.h

ThunderLAN: remove is_eisa flag

2013-05-20 00:20:14 -07:00