diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-14 18:15:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-14 18:15:40 -0700 |
| commit | 16382ed978cb40713684cfa0f25dc255a58d0c59 (patch) | |
| tree | 3d1acc687a810aaa51cdc08b4d20d8de888eec6a /include/linux | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security (diff) | |
| parent | hwrng: bcm63xx - fix device tree compilation (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 an NFS regression caused by the skcipher/hash conversion in
sunrpc. It also fixes a build problem in certain configurations with
bcm63xx"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
hwrng: bcm63xx - fix device tree compilation
sunrpc: Fix skcipher/shash conversion
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions