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

Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

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

2015-09-26 16:08:27 -07:00

..

af_netlink.c

netlink: Replace rhash_portid with bound

2015-09-24 12:07:08 -07:00

af_netlink.h

netlink: Replace rhash_portid with bound

2015-09-24 12:07:08 -07:00

diag.c

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

genetlink.c

genetlink: simplify genl_notify

2015-09-24 12:25:23 -07:00

Kconfig

netlink: kconfig: move mmap i/o into netlink kconfig

2013-05-01 15:02:42 -04:00

Makefile

netlink: Diag core and basic socket info dumping (v2)

2013-03-21 12:38:03 -04:00