David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
diag.c	unix_diag: fix info leak	2013-10-02 16:08:24 -04:00
garbage.c	af_unix: fix a fatal race with bit fields	2013-05-01 15:13:49 -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