linux

History

Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next This merge resolves conflicts with `75aec9df3a` ("bridge: Remove br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve netns support in the network stack that reached upstream via David's net-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/bridge/br_netfilter_hooks.c		2015-10-17 14:28:03 +02:00
..
netfilter	…
Kconfig	…
Makefile	…
README	…
TODO	…
af_decnet.c	…
dn_dev.c	…
dn_fib.c	…
dn_neigh.c	…
dn_nsp_in.c	…
dn_nsp_out.c	…
dn_route.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
dn_rules.c	…
dn_table.c	…
dn_timer.c	…
sysctl_net_decnet.c	…

README

                       Linux DECnet Project
                      ======================

The documentation for this kernel subsystem is available in the
Documentation/networking subdirectory of this distribution and also
on line at http://www.chygwyn.com/DECnet/

Steve Whitehouse <SteveW@ACM.org>