summaryrefslogtreecommitdiff
path: root/netsniff-ng
AgeCommit message (Expand)AuthorFilesLines
2013-05-13ring: break out timestamping since not directly relatedDaniel Borkmann1-0/+1
2013-03-15netsniff-ng trafgen: Find libnl-3.0 and libnl-genl-3.0 using pkg-configPeter Stuge1-2/+2
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann2-0/+54
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-05 11:02:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-05 11:02:00 -0700
commitd834502e2fca9380a1579fecd134ef94c063b662 (patch)
tree5f180e522792facbe222c3c28b69df8003c93304 /Documentation/devicetree/bindings/iio
parenteedf265aa003b4781de24cfed40a655a664457e6 (diff)
parent4693fc734d675c5518ea9bd4c9623db45bc37402 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull key handling update from James Morris: "This alters a new keyctl function added in the current merge window to allow for a future extension planned for the next merge window" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: KEYS: Add placeholder for KDF usage with DH
Diffstat (limited to 'Documentation/devicetree/bindings/iio')