David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
cassini.c	net: cassini: Deletion of an unnecessary check before the function call "vfree"	2014-12-05 21:14:19 -08:00
cassini.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
Kconfig	Merge branch 'akpm' (incoming from Andrew)	2013-02-21 17:38:49 -08:00
Makefile
niu.c	niu: remove one compound_head() call	2015-01-17 23:58:37 -05:00
niu.h
sunbmac.c	net: ethernet: sun: drop owner assignment from platform_drivers	2014-10-20 16:21:13 +02:00
sunbmac.h
sungem.c	sungem: Fix global namespace pollution of phy accessors.	2014-08-27 23:07:12 -07:00
sungem.h
sunhme.c	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
sunhme.h	sunhme: stop using net_device.{base_addr, irq}.	2012-04-07 11:47:03 +02:00
sunqe.c	net: ethernet: sun: drop owner assignment from platform_drivers	2014-10-20 16:21:13 +02:00
sunqe.h
sunvnet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
sunvnet.h	sunvnet: add TSO support	2014-12-08 21:19:04 -05:00