summaryrefslogtreecommitdiff
path: root/arch/arm64/lib/copy_template.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-05-15 20:32:12 +0300
committerDavid S. Miller <davem@davemloft.net>2016-05-15 20:32:48 +0300
commit909b27f706433a0b3dff79aa259de63aafe40a42 (patch)
treec13cda633379cdbef701e730027b6a19ba6b267e /arch/arm64/lib/copy_template.S
parent8fbb89c6fbfd1cda9ae413cd1e042837a8edbdeb (diff)
parent272911b889f47aa5bc3e004804fc2382f0ac6ce6 (diff)
downloadlinux-909b27f706433a0b3dff79aa259de63aafe40a42.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm64/lib/copy_template.S')
0 files changed, 0 insertions, 0 deletions