From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Jul 2015 17:33:22 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: omap-for-v4.3/fixes-merge-window~248
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34bef46e786ca6f884b8ed4be89e07b62f28ec3c;p=pandora-kernel.git

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
---

34bef46e786ca6f884b8ed4be89e07b62f28ec3c
Reading git-diff-tree failed