| commit | a6b6e6165057f55c4cd35780520275d3c46e4c82 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 11 09:28:13 2017 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 11 09:28:13 2017 -0800 |
| tree | 37dee7c89b8428fa5ba439d7990324dd645e7f76 | |
| parent | 807b93e995d1f44dd94b4ec50d3a864e72296416 [diff] | |
| parent | 07825f0acd85dd8b7481d5ef0eb024b05364d892 [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This fixes a regression in aesni that renders it useless if it's built-in with a modular pcbc configuration" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni - Fix failure when built-in with modular pcbc