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
..
alx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
atl1c	atl1c: Call dev_kfree/consume_skb_any instead of dev_kfree_skb.	2014-03-24 21:18:54 -07:00
atl1e	ATHEROS-ATL1E: Convert iounmap to pci_iounmap	2014-03-18 16:12:56 -04:00
atlx	atheros/atlx: use SET_ETHTOOL_OPS directly	2014-03-24 12:45:01 -04:00
Kconfig	alx: remove NET_CORE Kconfig select	2013-07-01 13:18:19 -07:00
Makefile	alx: add a simple AR816x/AR817x device driver	2013-06-17 16:04:34 -07:00