summaryrefslogtreecommitdiff
path: root/proto_mpls_unicast.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/+109
/tr> committerJens Axboe <axboe@fb.com>2017-01-27 11:56:06 -0700 commitc14024dbb156c8392908aaa822097d27c6af8ec8 (patch) tree02f6ffa664b16bd76750c05f62708a518de2acdc /drivers/usb/host/fhci-dbg.c parent08965c2eba135bdfb6e86cf25308e01421c7e0ce (diff)parent3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'drivers/usb/host/fhci-dbg.c')