summaryrefslogtreecommitdiff
path: root/proto_ipv6_in_ipv4.c
AgeCommit message (Expand)AuthorFilesLines
2014-02-24dissectors: Get rid of unecessary includes of protos.hTobias Klauser1-1/+0
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+25
d> committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-31 09:43:24 -0700 commit367d3fd50566a313946fa9c5b2116a81bf3807e4 (patch) treea981e9f422fb348f6fd06baa5ddf9637fd1ad366 parent5eca83174264a8eacf854685c59e08b7e1d628a3 (diff)parentcf0d44d513f275be9ce42158079d4257e8973889 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky: "Three bugs fixes and an update for the default configuration" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390: fix info leak in do_sigsegv s390/config: update default configuration s390/bpf: fix recache skb->data/hlen for skb_vlan_push/pop s390/bpf: reduce maximum program size to 64 KB
Diffstat