]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f982bb 2136bb5)
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)
commitaf039ba97bbd63a76eae97a72d0383fcdfe0eb92
tree7b8bcee0b8fb4ec18866e067d0164890f1dbcfactree | snapshot
parent9f982bb1128a7f4215b5eb0c7b858c42c74a38d9commit | diff
parent2136bb58c367bc82d8a99551b20c6efbb5735420commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.