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
..
Kconfig	net: Move MII out from under NET_CORE and hide it	2013-06-19 22:22:56 -07:00
Makefile	ks8*/ksz8*: Move the Micrel drivers	2011-08-12 00:22:18 -07:00
ks8695net.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
ks8695net.h	ks8*/ksz8*: Move the Micrel drivers	2011-08-12 00:22:18 -07:00
ks8842.c	dmaengine: remove DMA unmap flags	2013-11-14 11:04:38 -08:00
ks8851.c	net: micrel : ks8851-ml: add vdd-supply support	2014-03-24 00:36:47 -04:00
ks8851.h	drivers/net: fix up stale paths from driver reorg	2012-01-30 12:54:40 -05:00
ks8851_mll.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
ksz884x.c	ksz884x: Call dev_consume_skb_any instead of dev_kfree_skb.	2014-03-24 21:19:06 -07:00