David S. Miller 54e5c4def0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_alb.c drivers/net/ethernet/altera/altera_msgdma.c drivers/net/ethernet/altera/altera_sgdma.c net/ipv6/xfrm6_output.c Several cases of overlapping changes. The xfrm6_output.c has a bug fix which overlaps the renaming of skb->local_df to skb->ignore_df. In the Altera TSE driver cases, the register access cleanups in net-next overlapped with bug fixes done in net. Similarly a bug fix to send ALB packets in the bonding driver using the right source address overlaps with cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-24 00:32:30 -04:00
..
Kconfig
Makefile
vlan.c	vlan: Fix lockdep warning with stacked vlan devices.	2014-05-16 22:14:49 -04:00
vlan.h	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlan_core.c	vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu()	2014-05-12 14:39:13 -04:00
vlan_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
vlan_gvrp.c
vlan_mvrp.c
vlan_netlink.c	8021q: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
vlanproc.c
vlanproc.h