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 /security/apparmor/policy_unpack.c | |
| parent | 4c0b1c67c6250be73cedeac935b860e09de4420f (diff) | |
| parent | 47cd30608f3fc3dbb4fdf37300baca911e2dde34 (diff) | |
| download | linux-16382ed978cb40713684cfa0f25dc255a58d0c59.tar.bz2 | |
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 'security/apparmor/policy_unpack.c')
0 files changed, 0 insertions, 0 deletions