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

Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

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

2015-12-03 21:09:12 -05:00

..

af_unix.c

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

2015-12-03 21:09:12 -05:00

diag.c

VFS: net/unix: d_backing_inode() annotations

2015-04-15 15:06:56 -04:00

garbage.c

net: unix: garbage: fixed several comment and whitespace style issues

2015-04-23 13:15:20 -04:00

Kconfig

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

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

Makefile

unix_diag: Write it into kbuild

2011-12-16 13:48:29 -05:00

sysctl_net_unix.c

net: Convert uses of typedef ctl_table to struct ctl_table

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