David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-06 22:34:15 -04:00
..
Kconfig
l2tp_core.c	l2tp: unregister l2tp_net_ops on failure path	2015-04-06 16:53:02 -04:00
l2tp_core.h
l2tp_debugfs.c
l2tp_eth.c	l2tp: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:38 -05:00
l2tp_ip.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
l2tp_ip6.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
l2tp_netlink.c	netlink: implement nla_get_in_addr and nla_get_in6_addr	2015-03-31 13:58:35 -04:00
l2tp_ppp.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
Makefile