You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		10 years ago
..
Kconfig	…
Makefile	…
af_packet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
diag.c	…
internal.h	packet: free packet_rollover after synchronize_net	10 years ago