diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-06 07:30:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-06 07:30:22 +0100 |
| commit | 8af31363cda93724c237b6ffb24380f4441d2f8d (patch) | |
| tree | dc25d9ff94761b0adc9381aebd06c8e7f77884e3 /.gitignore | |
| parent | ddc4becca1409541c2ebb7ecb99b5cef44cf17e4 (diff) | |
| parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 705e09913dc2..1be78fd8163b 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,7 @@ all.config # Kdevelop4 *.kdev4 + +#Automatically generated by ASN.1 compiler +net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c +net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h |