summaryrefslogtreecommitdiff
path: root/proto_vlan_q_in_q.c
AgeCommit message (Expand)AuthorFilesLines
2015-05-04netsniff-ng: Rename protocol dissector member of struct pkt_buffTobias Klauser1-2/+2
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/+63
Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-16 17:42:10 +0200 commite06226e66beafd6118aa81b511d88cb549ad7ea5 (patch) tree8ef298d1e1c866566fdc0463c22d196d65771a9a parent08c5cd37480f59ea39682f4585d92269be6b1424 (diff)parentf190fd92458da3e869b4e2c6289e2c617490ae53 (diff)
Merge tag 'usb-serial-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.8-rc7 Here's another Infineon flashloader device id. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat