projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc0195a 030f4e9)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jul 2015 17:33:22 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Jul 2015 17:33:22 +0000 (10:33 -0700)
commit34bef46e786ca6f884b8ed4be89e07b62f28ec3c
tree7b8bcee0b8fb4ec18866e067d0164890f1dbcfactree | snapshot (tar.gz zip)
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590commit | diff
parent030f4e968741d65aea9cd5f7814d1164967801efcommit | diff
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a duplicate dma_unmap_sg call in omap-des and reentrancy
  bugs in the powerpc nx driver which may cause bogus output or worse
  memory corruption"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: nx - Fix reentrancy bugs
  crypto: omap-des - Fix unmapping of dma channels
Motorola kernel-slsi