summaryrefslogtreecommitdiff
path: root/net/ipv4/netfilter/nf_dup_ipv4.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/netfilter/nf_dup_ipv4.c')
0 files changed, 0 insertions, 0 deletions
tion/sysrq.txt?id=1ad9bf9fdc29d36baa2db1d0f09ec684ff915f2b&id2=82b23cb94b8cee25781c209d9b1df3b144c8bb5f'>diff)parentea5dfb5fae81939f777ca569d8cfb599252da2e8 (diff)
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Misc fixes: two EDAC driver fixes, a Xen crash fix, a HyperV log spam fix and a documentation fix" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86 EDAC, sb_edac.c: Take account of channel hashing when needed x86 EDAC, sb_edac.c: Repair damage introduced when "fixing" channel address x86/mm/xen: Suppress hugetlbfs in PV guests x86/doc: Correct limits in Documentation/x86/x86_64/mm.txt x86/hyperv: Avoid reporting bogus NMI status for Gen2 instances
Diffstat (limited to 'Documentation/sysrq.txt')