David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
cpmac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
cpsw_ale.c	drivers: net: cpsw: enable promiscuous mode support	2014-01-23 13:12:14 -08:00
cpsw_ale.h	drivers: net: cpsw: enable promiscuous mode support	2014-01-23 13:12:14 -08: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	2014-03-25 20:29:20 -04: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	ptp: drivers: set the number of programmable pins.	2014-03-21 14:21:14 -04:00
cpts.h	ti: Remove extern from function prototypes	2013-09-24 12:54:10 -07:00
davinci_cpdma.c	net: davinci_emac: Fix rollback of emac_dev_open()	2014-03-24 15:32:03 -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: Fix rollback of emac_dev_open()	2014-03-24 15:32:03 -04:00
davinci_mdio.c	net: davinci_mdio: Fix sparse warning	2014-01-16 17:29:53 -08: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