You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		11 years ago
..
Kconfig	netlink: kconfig: move mmap i/o into netlink kconfig	12 years ago
Makefile	…
af_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	11 years ago
af_netlink.h	netlink: have netlink per-protocol bind function return an error code.	11 years ago
diag.c	netlink: Fix build with mmap disabled.	12 years ago
genetlink.c	net: Use netlink_ns_capable to verify the permisions of netlink messages	11 years ago