| commit | 16382ed978cb40713684cfa0f25dc255a58d0c59 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 14 18:15:40 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 14 18:15:40 2016 -0700 |
| tree | 3d1acc687a810aaa51cdc08b4d20d8de888eec6a | |
| parent | 4c0b1c67c6250be73cedeac935b860e09de4420f [diff] | |
| parent | 47cd30608f3fc3dbb4fdf37300baca911e2dde34 [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