summaryrefslogtreecommitdiff
path: root/update-oui.py
AgeCommit message (Expand)AuthorFilesLines
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+81
d/>
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-30 15:20:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-30 15:20:18 -0700
commit446985428d2cd10efd5d139c33de16c50ee771ba (patch)
treeeab5e1a239c891b25329726b780fbc5092aacb5e
parentb02b1fbdd338f70e49efa9ca9899214134526701 (diff)
parentab6a11a7c8ef47f996974dd3c648c2c0b1a36ab1 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes the following issues: - missing selection in public_key that may result in a build failure - Potential crash in error path in omap-sham - ccp AES XTS bug that affects requests larger than 4096" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ccp - Fix AES XTS error for request sizes above 4096 crypto: public_key: select CRYPTO_AKCIPHER crypto: omap-sham - potential Oops on error in probe
Diffstat