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 b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		9 years ago
..
Kconfig	…
Makefile	…
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	9 years ago
diag.c	unix_diag: fix incorrect sign extension in unix_lookup_by_ino	9 years ago
garbage.c	unix: correctly track in-flight fds in sending process user_struct	9 years ago
sysctl_net_unix.c	…