linux-sg2042/net/netlink
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -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
af_netlink.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-03 23:32:12 -07:00
af_netlink.h netlink: have netlink per-protocol bind function return an error code. 2014-04-22 21:42:26 -04:00
diag.c netlink: Fix build with mmap disabled. 2013-04-23 15:39:03 -04:00
genetlink.c genetlink: remove superfluous assignment 2014-06-02 10:36:18 -07:00