David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55: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
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
diag.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
garbage.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
sysctl_net_unix.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00