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
..
cs89x0.c	cirrus: cs89x0: fix time comparison	2014-12-15 11:44:21 -05:00
cs89x0.h
ep93xx_eth.c	net: ep93xx_eth: Delete unnecessary checks before the function call "kfree"	2015-02-05 00:35:00 -08:00
Kconfig	net: cs89x0: always build platform code if !HAS_IOPORT_MAP	2015-01-29 15:08:20 -08:00
mac89x0.c	cirrus/mac89x0: Remove superfluous interrupt disable/restore	2014-10-24 00:43:28 -04:00
Makefile