From: Linus Torvalds Date: Sat, 27 Oct 2007 17:10:40 +0000 (-0700) Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f5a2c553d1484141ebb369ecab61894e9cb074f;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'master' of /linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [CRYPTO] users: Fix up scatterlist conversion errors [CRYPTO] tcrypt: Move sg_init_table out of timing loops [NETNS]: Fix get_net_ns_by_pid [NET]: Marking struct pernet_operations __net_initdata was inappropriate [INET] ESP: Must #include [TCP] IPV6: fix softnet build breakage --- 0f5a2c553d1484141ebb369ecab61894e9cb074f