diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-28 12:31:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-28 12:31:49 -0700 |
| commit | e26f1bea3b833fb2c16fb5f0a949da1efa219de3 (patch) | |
| tree | 5ef2fcc307b354b7c2ceee27ac18346b91b9ba69 /drivers/nfc/st95hf | |
| parent | 0a2a1330d2621c7f963d9f55bb094811cc1c06b9 (diff) | |
| parent | 41cdf7a45389e01991ee31e3301ed83cb3e3f7dc (diff) | |
| download | linux-e26f1bea3b833fb2c16fb5f0a949da1efa219de3.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:
- remove broken dt bindings in inside-secure
- fix authencesn crash when used with digest_null
- fix cavium/nitrox firmware path
- fix SHA3 failure in brcm
- fix Kconfig dependency for brcm
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: authencesn - Fix digest_null crash
crypto: brcm - remove BCM_PDC_MBOX dependency in Kconfig
Documentation/bindings: crypto: remove the dma-mask property
crypto: inside-secure - do not parse the dma mask from dt
crypto: cavium/nitrox - Change in firmware path.
crypto: brcm - Fix SHA3-512 algorithm failure
Diffstat (limited to 'drivers/nfc/st95hf')
0 files changed, 0 insertions, 0 deletions