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>

2016-02-23 00:09:14 -05:00

..

af_unix.c

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

2016-02-23 00:09:14 -05:00

diag.c

unix_diag: fix incorrect sign extension in unix_lookup_by_ino

2016-02-19 23:49:23 -05:00

garbage.c

unix: correctly track in-flight fds in sending process user_struct

2016-02-08 10:30:42 -05:00

Kconfig

net: Default UDP and UNIX diag to 'n'.

2012-01-07 12:13:06 -08:00

Makefile

…

sysctl_net_unix.c

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00