David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-06-24 02:58:51 -07:00

..

af_packet.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-24 02:58:51 -07:00

diag.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

internal.h

packet: free packet_rollover after synchronize_net

2015-06-21 09:30:42 -07:00

Kconfig

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00

Makefile

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00